From patchwork Tue May 6 14:38: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: 887790 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp2585342wrq; Tue, 6 May 2025 07:41:58 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUiiiYdBT18mkpvXQ92uhXVvyi+8J+hWb+3xDhduvCSuq63boKH9b0jpwBz+Q8WwL8pACcgBQ==@linaro.org X-Google-Smtp-Source: AGHT+IGChQ2rhUCQ1drr+J68ofCIh4SGS9C8QkWV7rDphLnSUlxU/yO+a0eu4EX4ddqtfjPx6HvP X-Received: by 2002:a05:6122:920:b0:520:61ee:c821 with SMTP id 71dfb90a1353d-52b06889a5dmr6471256e0c.3.1746542518530; Tue, 06 May 2025 07:41:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746542518; cv=none; d=google.com; s=arc-20240605; b=iTNg8jxMJKZhufByop3RYHLWb+MZCwk23mFEELtGZBmtLCdgLnRhkfaWHQts9DmHej Lk3a7WcxPauvalaAGkNUMnKYvrRhBuOaO4clYoRUvIyIdMb8yKg/Avc5zvM7fh+1vfw8 vUbd9A/OkW7+GmO2WkkXYdGbs4umAFyyUacV7i1ND5LH0/4UkPvpBGCcDp/nsz0p2hFU s41YmmpBUEcQjJ6hNJq/fSQ8NjE3d8nAFY8VqwwjxmfYg9eMn7OQ27rEd7qQ2hw2uWSd S+L2MzOyB2XNicWFQ5dulIgWFqsHGFj3+s22BBc1gYaedtFkRjAmkv29Rtf9RnI2yC19 2P2Q== 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=t7YKbHq/LJts8Dl4vIFPRVyvpe2WYzTjo0E70rc+Vt4=; fh=yv/UmZ//SMR7OMCPM+hEQ1cdGiNsmlJhsS8KuguVnUs=; b=bqZHQuTPq7ZPUsHYMq+r/MerKDds5s/ZWYY52aAaF+A1GhwalhJDwPAzYLdeQxX38N WpuNPLa6ZScR/Nx5AB0v3k/C/rzKA/4bwrhhv1xU0zL2n2KM1jlKgFyLCl0i7IlJGE3x dvE+cwxImpeIB0o8Wpva95xQv65ac7y5vD6x4vaQrVpLO4r5PZGD4HH4pGujPYSxmnPr hLiQjBmaQW5KE0UAtmEGsQlRu+piSOXQEoBtZc9Lhqj95c89DbVZt5MXNLTUqhjPrCEa MdEoMFbqPpDA7qGO7tOJlswlLfieZf69P/o/iwoImYGHlwFn73ASUqgLp6sdpLU5beF3 OhAQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=dvsfjv8y; 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 71dfb90a1353d-52ae402640csi2777462e0c.93.2025.05.06.07.41.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 May 2025 07:41:58 -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=dvsfjv8y; 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 1uCJSm-0007am-Md; Tue, 06 May 2025 10:40:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uCJS1-0006gx-ID for qemu-devel@nongnu.org; Tue, 06 May 2025 10:39:21 -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 1uCJRz-0001Ld-3U for qemu-devel@nongnu.org; Tue, 06 May 2025 10:39:16 -0400 Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-39ee57c0b8cso5208844f8f.0 for ; Tue, 06 May 2025 07:39:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746542352; x=1747147152; 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=t7YKbHq/LJts8Dl4vIFPRVyvpe2WYzTjo0E70rc+Vt4=; b=dvsfjv8yU9V8QDOYHZMMLZytgeHyZOx9QjPDHp9VQUc6GNLWdSPqYDbauPCHDhTL4C qcdIhshQq55+d4/G1GesfZor6I30yFfqCZL6WdKttA8PTqvonq0OtaqCREe8IKXx958o PsYrsD3QULcG1crg1Tqnv9FfU13m25BwLvg4qPgVIBFcA1/YGPQp4EXm1G6pIDgKs8V6 V9hMuj7qpN5EYAU2ZdqjAfTSsX+ki1gWkyHuPz0Exqp0tmt48c5+Gg3JllrTIEaJb4Bi YbveJUkWFg+RzJwsQaUelId3OmpKdvrrZQiv9jiN40LbltRk1dGwcm1tW3WoW307YSsq 5inQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746542352; x=1747147152; 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=t7YKbHq/LJts8Dl4vIFPRVyvpe2WYzTjo0E70rc+Vt4=; b=Qwqb+nyTHpleTgKjY0+IlenGPGA4OWDGetViLqiwfivcK2cFJqRDuYdm5q8E36GCn+ RYts3PSqSOMNqg7ky2uHSHrKvdXN7n8dwn5ifQ2Bsn1lqbeP2+vaM8qSEs4Hr9TPlpQO r0vjQQiQOmmmW4Ds9mD4mzK0S9w3HPuLaXbPflhIDAOQ3fUiRUuRjRdkoEMUkX9h2tVq h2rarZA9qEYfSdiY2dHqQhOGZb4kqoKV91T/Z8NNYlNrkF6+pyopu3DT69q91UU4CS8A gPt3eMzxARnW/35P8U5YITJfuDYniADPekddUl12LfFOOdjB1UvPyxuEEwLWDNXsSHK5 QHHA== X-Gm-Message-State: AOJu0YwXU0n6zeSGAMI+Ca0CHODFWz2OxGy4mf111g/5oL9QWL9awagQ /m9vhDuPBemMQ3hR8ojz+jD40KnKQ7/IMRowb1/GPOlrQ2sxOcSThiUWId4qnBOSBht2+xNf9lf N X-Gm-Gg: ASbGncuMfFaqDDp/ia39U+IdhxCeqQrdJMdb8HZ47d6PhLouMMt5GfKd2MXRwubXexH W2WRt2K7vqTB0lJSp0ZzVWdwCYFsakUTIa+ujbhO3Pl9qaJNKMxhyptcbiV2pKcys/RURtHazEI vxOYv5wDx2blIrvyxU62w9C5KkefTByUUmfqWDgUPZoVMb0bgtGhQA8Ip6zoSiabXlj9nBESUVE 6E3n6NxDl1EX+Fd3dy6355f1U6mvzL078EL0UuEx/ioH4xZoPMoNd/1zr24XebbFM7BiceeBGUi PYR0UjTFsEAsloEIBhTDOZS7wxyuOHtJwSU/ufoYzftHRIpX9yU6U1TCd4TmqyYmmKCnfDQczl8 4xpjLCwdb4xWgZv7Qq1ZY X-Received: by 2002:a05:6000:40e1:b0:39c:1257:cd3f with SMTP id ffacd0b85a97d-3a09fddf14cmr9646174f8f.57.1746542352423; Tue, 06 May 2025 07:39:12 -0700 (PDT) Received: from localhost.localdomain (91-163-26-170.subs.proxad.net. [91.163.26.170]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a099ae3441sm13696073f8f.26.2025.05.06.07.39.11 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 06 May 2025 07:39:11 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Yanan Wang , Paolo Bonzini , Eduardo Habkost , Fam Zheng , Hanna Reitz , Zhao Liu , qemu-block@nongnu.org, Dmitry Fleytman , Richard Henderson , Laurent Vivier , John Snow , Jason Wang , Marcel Apfelbaum , "Michael S. Tsirkin" , Gerd Hoffmann , Fabiano Rosas , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Thomas Huth Subject: [PATCH v3 01/19] hw/i386/pc: Remove deprecated pc-q35-2.4 and pc-i440fx-2.4 machines Date: Tue, 6 May 2025 16:38:47 +0200 Message-ID: <20250506143905.4961-2-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250506143905.4961-1-philmd@linaro.org> References: <20250506143905.4961-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=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 qtest in test-x86-cpuid-compat.c file. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrangé Reviewed-by: Thomas Huth --- 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 Tue May 6 14:38: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: 887829 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp2589022wrq; Tue, 6 May 2025 07:49:59 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUdBMEvIdwCE+GvTekCcdDdfTohAlAUjtYAKdu9Th8gaxiphlrqFRvOzbCJCT2hOOJEgwBumA==@linaro.org X-Google-Smtp-Source: AGHT+IHE9R99Qwew0/bLYH7MxOe/os5ja5HcLPgUmSIcRmuMOF1UjQ6AJn/1cmPWmeEN+OvXW9r0 X-Received: by 2002:a05:620a:198a:b0:7c9:5602:1314 with SMTP id af79cd13be357-7caf094c104mr501773185a.33.1746542999346; Tue, 06 May 2025 07:49:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746542999; cv=none; d=google.com; s=arc-20240605; b=Br0vG+6O4BiVetdEolMbZX6bWjEVoXKTh2eB9wAgNIheNNobdmtSyxIpkjaFM1QH+A cjHTfTc1rI3A2UKmK2xafHrfHe+eqj/kyVH6pnT4A7ECKuDLVU4WTKtxkS8c84+QZ/i5 ndtCZX5R51KVPwjbRuwq79T3jZaeKpgkcBw4Hxm5ZVgDn5qcOal59LzQLAWw9/ydNDPr Qfuf7caDtm/wbVVkC70PmtY0yFppDhmq5mXOadHX4Lu0V3hQrVKKPx0rPDSUHTNvOBDU CovaXbXqVckYfvPeRSlXjaQh9U6Q7GkOJN9UJ/mJQHsrjR4pBqFrg4fS5k/bVe0yyT8R OMKA== 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=/fyCoBA0tWbab3gBiKQWh21M4Tnr1243A7o99XgmYbE=; fh=yv/UmZ//SMR7OMCPM+hEQ1cdGiNsmlJhsS8KuguVnUs=; b=F3v8G41jg0eCYLsb2ygrhI3a4WedfhS4/VlmthJq9B/qS0hclsoOXAz626ZSsmxt/Z PqHO6WZrHl+OpwgeOUfdcm4XGg/3T1meWJoUXcmMmTJJZ5nW/6rOfhIV3gXQjK2tMNQX h2QhLKOJb9H3uIuR+VDrbO1t14kzBfKM4ZX38R7Qs6YatZInzsnEs8EvCM9zUz8DROGl VdfoRrX2I3Rj7QK3Q+AKL5vstkv2QwkzpitQvuXpxHLakHuNZSejA5juAXrLWFKxYJIn EVj/LrKuSZ8v5BjRUbR8RRhPJF9ZylhwrUEDhR8DkmwkRosFq++LV19UZD7+bn64kV5w gjZA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=DyHxCtfb; 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-7cad2448ac6si1217073085a.519.2025.05.06.07.49.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 May 2025 07:49:59 -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=DyHxCtfb; 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 1uCJUZ-0000qL-RT; Tue, 06 May 2025 10: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 1uCJSE-0006q6-S4 for qemu-devel@nongnu.org; Tue, 06 May 2025 10:39:34 -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 1uCJS7-0001Mq-SO for qemu-devel@nongnu.org; Tue, 06 May 2025 10:39:28 -0400 Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-3a07a7b517dso3742139f8f.3 for ; Tue, 06 May 2025 07:39:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746542357; x=1747147157; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/fyCoBA0tWbab3gBiKQWh21M4Tnr1243A7o99XgmYbE=; b=DyHxCtfbJlJSvguaipk9HIVskXyozTYw9Orhl65rLUH/+rD+dDanPogYZbMGZti071 2UEUzU0Jde0lJD+GYkzvo9rfaeCYTBco41ntLI6eJEpVuurt53H+YaWa6GkiVEOw8Y6C RaE90MM5GvINJlhth+0zmhQs9mhF5Iu4Uu324e0AyYE/jNYvW8Fp+ejJ1/HYkrcdZeo3 8kyhup7vkDlWGSud+MbhneEiC+18IAwTf2OxrbAfN6LCHzB5PwEsmpl/NWXT+L2pn6Bc +RkqFRfuY0CqUoFvflkLiON1aMI1sQQSMIQqQXxg2NHiq24znrN7Nthn2BMfXCiTrwwY m7ZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746542357; x=1747147157; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/fyCoBA0tWbab3gBiKQWh21M4Tnr1243A7o99XgmYbE=; b=pppsfxf53NukZdqd7z9DP+9U+iLkJq+ClY74xyyZm/Oju4OuPqpmxHeDgDnsUmC5Gy 9VIss8QSY4btLKjlotANcNSyhMJizhD7JfWLAb5NhItsLyHIQzMgO4ROOtAhBle+TxuF f0D2QtcGyS2mPS+8CqU3D49DRaA1RDF62Kvdvqe7paclAxw5gtGOeCCJYlHzhnVgkPUb uUHlfjG2tPAmugLQMQY5bCJhNt8cRWeGYU0EJ3dDnqVT1g/lpHq6R2xXUXasDOe8sZSg KJPfLzLViOb94QyKLGXpr9BcQxyb/ZbEsg2ALLBpz/hAS8Kpj6PmAHub0QN6nEcHHQa6 nGKQ== X-Gm-Message-State: AOJu0Yz7nCJfyqhcVlrELwpMQtksFdkMaADcNFatc5NAkzuavneWYL+o t+LHNqs3+O+EOGLLR2ZQfk+BP54TVdRJhUqxOQEcMqqOtnQLKNfDFIEG3KPjBY2m4me8DGI2cvC D X-Gm-Gg: ASbGncvc//TYC0jEE6c/5LD9G8/FndQ2EJn9PzWOy7wcENeohSIBG2EDXYnFBwVXKQJ uhE2GXgYxnO0FwkjK75CWgHdBpOGHOwiddYJt9mgSZttYaBqnmRmWJZ9HvmW+Few8qr2KGuFbCK UaSeaXgd4GgEf6W2i6yQt6xAJ6CZr80C6U0AiJ7W10+skGEKY+IL6YNzSYBI8rsRKR2PXcqZ7zz 85nDacaxWFx4wMSKx7sWXeDUhO1D1OR2JbXzEjnI08xN57Sg81l2t/L1ZwXth0W2BDaLilWUg6D 5KSb+Y46QeJoYm2XuO3VPk0ZBDfml9EypOsi4wEg8uEoOsjSRt6TOIgToX+GxlFvuObBlSeOE/2 h4JHb0IsrE6G52eGiRz9aI3QBgFNHfD8= X-Received: by 2002:a05:6000:1867:b0:39f:a553:3d98 with SMTP id ffacd0b85a97d-3a0ac3eb316mr3073477f8f.56.1746542357212; Tue, 06 May 2025 07:39:17 -0700 (PDT) Received: from localhost.localdomain (91-163-26-170.subs.proxad.net. [91.163.26.170]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-441b2b20aa6sm220489865e9.27.2025.05.06.07.39.16 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 06 May 2025 07:39:16 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Yanan Wang , Paolo Bonzini , Eduardo Habkost , Fam Zheng , Hanna Reitz , Zhao Liu , qemu-block@nongnu.org, Dmitry Fleytman , Richard Henderson , Laurent Vivier , John Snow , Jason Wang , Marcel Apfelbaum , "Michael S. Tsirkin" , Gerd Hoffmann , Fabiano Rosas , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Thomas Huth Subject: [PATCH v3 02/19] hw/i386/pc: Remove PCMachineClass::broken_reserved_end field Date: Tue, 6 May 2025 16:38:48 +0200 Message-ID: <20250506143905.4961-3-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250506143905.4961-1-philmd@linaro.org> References: <20250506143905.4961-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 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 --- 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 Tue May 6 14:38:49 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: 887810 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp2587773wrq; Tue, 6 May 2025 07:47:00 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWCV4KW/NpCOU6PCYUfPA+df0WG7nLLRjZnfJ469NZNQq2bRaX6TIEAzE+H4JM1LH2LtEe2bg==@linaro.org X-Google-Smtp-Source: AGHT+IGZLrR8otuK40xbciQVMhhUs2XM2P/elJzwaOiEOPItoBcBmfCQIi2HzhAbab0bR234QC7H X-Received: by 2002:a05:6214:2423:b0:6e8:f8a8:83f2 with SMTP id 6a1803df08f44-6f53588ca88mr47296646d6.6.1746542820243; Tue, 06 May 2025 07:47:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746542820; cv=none; d=google.com; s=arc-20240605; b=Vb0ly3SN9dZPCRLS4HIRZ64UKMeTVoYbOz/1ta+G4jdVnXJIE2PFLlC7RraAiN7kaR yzAdiTBEAVwbci0Ue5aVKtJProVzyML6kVNro8UJlL/ugZt/ZHrkijuJbLqjbbC1LR8w rSjbrBYAyFhd450zt3qCxhxKl5/AfhyYgLDvX/qBem55L1AWSWOjpUHjVWfTEVAZsWoM D9gxYa+pe+73vHLHWC0udl4yFEMqvgGlvagxIqXSb4mcCGFM2PTxo1YWgRaUfPDz/5jH OMWzyb95ztFJowu/0wXUVdMtAYjza4J3QlftUWg8+6hniwotKc4FbnEgJQtQsYiGlTru oOeg== 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=1rBTFzGlpmN0XM4Xhc9yiz4Q5nlS539l0QvdyVgqZAM=; fh=XSpotKJkk0QjO1VgmGgsyK7nnDHNLw4NWZrdrHYPOSw=; b=Q74vSW5WLKhPvl5rk4VQ8VO50jwpCFP77zhA0sUuhChk+knFm+yFznZtlhkN+15L9G 6ViUeyOeos0gWnN3UjUxYfXTjnelb4SRDdsn74DTcR2mnlqVZ4XH5zHOa2YRnQLDbpVF C77YajgrfwLDQYnVz5UzdBTx+Ng4Vqm2cDCTeL0x+jU8DVqIuTLMGzsA6DToRypRLDpo 4L/c/4NLqofC8dHAVYAVJrHGFMIeNHRFtliKqdnYr01rh9zhBbEHVXEsQne7fZWcAPNA sLTjll+b4utGJWiB9ZzJXftT4X5kGFdg4A3aoldxSDWgz+Et6P8y5ZHvVWLbkDLWLEAb 7kkQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=b4ykbO+J; 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-6f50f477107si110987896d6.213.2025.05.06.07.47.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 May 2025 07:47:00 -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=b4ykbO+J; 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 1uCJU7-0000G9-7H; Tue, 06 May 2025 10:41:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uCJSE-0006q1-QL for qemu-devel@nongnu.org; Tue, 06 May 2025 10:39:34 -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 1uCJS8-0001Nx-L7 for qemu-devel@nongnu.org; Tue, 06 May 2025 10:39:29 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-43d2d952eb1so32603725e9.1 for ; Tue, 06 May 2025 07:39:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746542362; x=1747147162; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=1rBTFzGlpmN0XM4Xhc9yiz4Q5nlS539l0QvdyVgqZAM=; b=b4ykbO+J15g+wh12lFCUrgh0juJ69bLqx7+6K/LtqNRF2pAqIrVK1g/pQ1FeFDGncR B6CiJE7uNc5KisVLX4xOWHmsZjM9sw95WO0xWXlhJXk+0MBqg/xPofxnoVc/60NJrJva WbnBYOVPPB1f31ojsigAK+ibAbioFpRfk9LWSDNvnhzEtbjVPOWcHak8yg/qZFZfghTE 5F/qsOdH1YKI9uTnTbg0Tr24AHgeedY83QE4yAdxGVyKVd4AHK5RktOfcnVwKCJxVFzc KCuScWS95RUWoXqNOeCftoLXbezSxi0+LyK73Xe3Ujub1m3sQVeBUkGb213t0ZdcnGNd AuCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746542362; x=1747147162; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1rBTFzGlpmN0XM4Xhc9yiz4Q5nlS539l0QvdyVgqZAM=; b=qVN8MCV/df2GZNQte/TC7SvJ4lo6VQE1+k1N5l2jL3hPoYVD77UEAiU/Wwc5FzdU9I Kq7Tyg+hx0EyS4S/BtgGKAkXqtU9s/fQggiSPmeNokjd+2o7c1BO4Io8tIB/QQi3lqHP wtbhZiu9dyfMeBhQRhBbfLy0lI2mlJ9vWR0cnaXfQ2kLcoddlpJWKsUeiuAJdl4+vaeh 24+NpYvpweIG373yyR7GG+IAds0wtEufIna0KxPsvr0hA2n9w5PMmq1f93gbG+g38SB1 UqQ56uGdhNX2fIsN03ik6BTXami24cEeYyc8poz1IUj55a+yDzy+UROGk+UxahZEyTbq 677w== X-Gm-Message-State: AOJu0YwlBJcec3aEkiTCOUeFWaDJNaTPbKnRrvyke7E39VKOAhchv+DR bdt0ERZXpIkK/E14n0inyUfpVHWYckt5rGKrtoWhCvlSb9p5oZgFhygemJ5pxhKWSPpv7gPGr6M f X-Gm-Gg: ASbGncsJmRFm6nBVflBFU5aBn9AfnGiVv8F7fzU9xjv/6PDqfeIFZCWhgAcMgg/zDFa IRHYx+IxDPa9GOJXrEi5XXLX8qX91Ydg5Jc05KUXwwLhRTjqgaNIEOsYZHrQvQv2fCkG2y++mK6 XT9zG6HUKkcARhvhwKWhZYxuYxfGttMsLZXG9FJ6GXcCiUqbAVE6lbz5ZAlfPIagZuFASDFkeQl 2eJ4RVfiTTP0DeujXGbJ+ZntZctfEIm9ZSpZ9ZWtfYh1850e6OHgReVNaXwKYBjA3ixqjmt7dY2 WUjae0xQQ30UvYX45kKatP6Iex10PVDgV9DhH3tuNqhWFfL8SrnBJXG/yUQHhIwJrvXTv+sJI24 msXF6DT6EO8YLXoDEhext X-Received: by 2002:a05:600c:3ba2:b0:43b:c5a3:2e1a with SMTP id 5b1f17b1804b1-441d0fbd2demr34983385e9.2.1746542361997; Tue, 06 May 2025 07:39:21 -0700 (PDT) Received: from localhost.localdomain (91-163-26-170.subs.proxad.net. [91.163.26.170]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a099ae8377sm14138964f8f.59.2025.05.06.07.39.20 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 06 May 2025 07:39:21 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Yanan Wang , Paolo Bonzini , Eduardo Habkost , Fam Zheng , Hanna Reitz , Zhao Liu , qemu-block@nongnu.org, Dmitry Fleytman , Richard Henderson , Laurent Vivier , John Snow , Jason Wang , Marcel Apfelbaum , "Michael S. Tsirkin" , Gerd Hoffmann , Fabiano Rosas , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= Subject: [PATCH v3 03/19] hw/i386/pc: Remove pc_compat_2_4[] array Date: Tue, 6 May 2025 16:38:49 +0200 Message-ID: <20250506143905.4961-4-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250506143905.4961-1-philmd@linaro.org> References: <20250506143905.4961-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 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é --- 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 Tue May 6 14:38:50 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: 887792 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp2585663wrq; Tue, 6 May 2025 07:42:41 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWIPlcjYmAghq8UFb2S7A7S+cXEABPsFpo/vV6IsQrVEjcsyDTbSm19SLNGrUbK2hG6g9RmPw==@linaro.org X-Google-Smtp-Source: AGHT+IGUmGTjQ3eFxoIrLJIUVnTQmxcJ4W7ly1QziuNvpE1mF/40pN6ke3srsbqZ9yOMy5vB+wY1 X-Received: by 2002:a05:6102:2c88:b0:4c3:6568:3e18 with SMTP id ada2fe7eead31-4db14824a00mr7851581137.15.1746542561677; Tue, 06 May 2025 07:42:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746542561; cv=none; d=google.com; s=arc-20240605; b=K3PjnKIaOwSKvJhpayznHD1LQ/nG1H8i61D6Q6n2D2PZZXRVsRAxeAQwQZgPcvQzlh v6pwQX/dJi8MNcNc+MEGmrENBMtU2m2FmdLZmeaywmcHyDO/Apedjh/ElWepwrQn/I+9 gNk+wTb4HhlkEgl0A4nRYuxvSw1GrZNFyUX9bruzzm9I53mw4gk/dDN/wHsBFzsslHUq je7wy1S/ctc/Ipitom9m+PIyEWK5iCMvKFkUGErYL4aEg4ADF50RmHEeFbx/cKgtgOrt TvqtYjc/IQwuXPBmb+GCO5MLHhlJhylx/hNXx1TjB9ot3mvDLxN6NEI7Ayb8MTIHnyIv v3yA== 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=2TdK0KknkLOYwI+XSWuaAcvX7rG//eSaXjO5J4+I7ro=; fh=XSpotKJkk0QjO1VgmGgsyK7nnDHNLw4NWZrdrHYPOSw=; b=cHirGJOEEQrZYj89j9JOacbvpOvbsjbiIGrVBM+/8BWVFWZK8QXWeWr1btvzmjKNl0 W2aqc1//KbMaSTAmeB0CGovX/GGlDPC9XX37wtbAzqZ37k7ZFocUGtLXGpJrCIcLmkrj g33+nHlsUnJpkZiOJBTFWGgFye0tfimOavZCb7FJ6vNS3jlhqli6joCU0wLfiXj/uJyV G0WxSZIdlWO/s+8Ezj9+0KLGgGPnEBLhY2Km/KubE2nfRbkNpZrRRhtxo5xjA3R9z3XB BiMjyCXpAhbDhQfsllpwMzCorGWbTGneZDcJv8AwfX3PPidBAcu7HEAEBYCC6LdlLI5W of6g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=SxFyPsX5; 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 ada2fe7eead31-4daf264719asi2380889137.651.2025.05.06.07.42.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 May 2025 07:42: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=SxFyPsX5; 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 1uCJVC-0001RQ-51; Tue, 06 May 2025 10:42: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 1uCJSI-0006rB-C7 for qemu-devel@nongnu.org; Tue, 06 May 2025 10:39:34 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uCJSE-0001PJ-GC for qemu-devel@nongnu.org; Tue, 06 May 2025 10:39:33 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-441d1ed82dbso5982555e9.0 for ; Tue, 06 May 2025 07:39:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746542367; x=1747147167; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=2TdK0KknkLOYwI+XSWuaAcvX7rG//eSaXjO5J4+I7ro=; b=SxFyPsX5XyDtGBCPQaSr3SAMSF2n7DdAy6t/hSwzJCbQtBMmxgkzYpvOMKhhppKvbv sjyCiNrF4IxrjopiGxpzHujPt8MwF2C1X/hZJe4vFBPxKmwIyu8U/mzxGJEiPvp8yeo4 e4xhcQI0bDqDdz+JadAZvNWmecNkSb0/o1f6vKhBQBmXSRzy5mlLPhB6MBrNsar0FErh vdeF52FP4yzLU/6WiQLZ6EYt0gVlK1FUtjzWRLQkczC9L1J/glBQwRBtXH2fcbLRBzWd HXgEHHUPGwkyhUU5FwHxDiiA0DpeCm3UDHlev6z0hQkebPptw3c2BdP3fPhaMTuUZmFJ scZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746542367; x=1747147167; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2TdK0KknkLOYwI+XSWuaAcvX7rG//eSaXjO5J4+I7ro=; b=sITGnr1C57KPYg9+wex3MobXNQcBoIEwlV6A+3TUkJrmcs5IRLrGfS4Kyi1GAkKLAn AgZArUHXo2OO1hj3PxpFv+rnQg0s/rd5wLpEQh0YjaeQtfOVObT/9MnKlZ7q0PAfNXL1 rm3lBAvI2/TZI2bHJBqedNr5hC9Q2OaDXZKx4T1TweSNTaEiAowCZNKJwnfGGOZUzCxF 9qZTgGosfa02szStpSq1LkVFfDmxll3fz6GDDuNrtBjXxnrWNgzw0ypWcTOkjFsi3/I7 tcWdHrgJzLVwfJrLgGaaGWSHt32ncrPOjE5MK3t/oJ0Qa8mMerUPYKUQ4JJXPQNFxc2R yXeg== X-Gm-Message-State: AOJu0YywYrLTgoWDhT3DHNv3DMIpNG0scMLOHDkcnBLAWm7FO/Wmxrxk k5I4QbmsKJtSh13Mj6dMWn/C3ev6L+fdZzk6c15cMNFFq0mg5pcmu+MR7Vu5N6rTJ6YQJVLUgGf d X-Gm-Gg: ASbGnctExzoPnKdSDOUFmFfvDDMFlKNHRBwtp4DcQPDm+34qbEdXz7D5ZLH8Yj0OQ5a Dqbt2wMfvwZhzdYooYn2/nH+9pjMLjpS7an9F6lxSuBJwBtFk6ag461/YLrwCqkxppyVZb9yEsX emO36lVPI5rM8TlP8yqPF34/UZxor9IicVLaMtIwlofBAu++We+i1Sr9hB2lj3Oc18vZpSXwwWk bvoAbvz7vQENuLIT1bQT6cHpsXMr0wPD4AALr9qAiMiTIjqZTo6mzZsHFvAK8iiG9Mf2ILZxPx3 Q9bKSlJ35tjZ5KYbjlQXNZc/Zi6OjCJfXDZD6rsTlLfMZjTrKbthGyQOVTnYWxHKj5iV4Hj+dug HHzSLtnxYpFq66HtFDI6g X-Received: by 2002:a05:600c:5297:b0:43d:49eb:9675 with SMTP id 5b1f17b1804b1-441d100a85cmr27233975e9.22.1746542366860; Tue, 06 May 2025 07:39:26 -0700 (PDT) Received: from localhost.localdomain (91-163-26-170.subs.proxad.net. [91.163.26.170]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-441b2af2a0csm216546445e9.18.2025.05.06.07.39.25 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 06 May 2025 07:39:26 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Yanan Wang , Paolo Bonzini , Eduardo Habkost , Fam Zheng , Hanna Reitz , Zhao Liu , qemu-block@nongnu.org, Dmitry Fleytman , Richard Henderson , Laurent Vivier , John Snow , Jason Wang , Marcel Apfelbaum , "Michael S. Tsirkin" , Gerd Hoffmann , Fabiano Rosas , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= Subject: [PATCH v3 04/19] target/i386/cpu: Remove X86CPU::check_cpuid field Date: Tue, 6 May 2025 16:38:50 +0200 Message-ID: <20250506143905.4961-5-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250506143905.4961-1-philmd@linaro.org> References: <20250506143905.4961-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=philmd@linaro.org; helo=mail-wm1-x32b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+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é --- target/i386/cpu.h | 1 - target/i386/cpu.c | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/target/i386/cpu.h b/target/i386/cpu.h index 54bf9639f19..3a5e17e0741 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -2168,7 +2168,6 @@ struct ArchCPU { uint8_t hyperv_ver_id_sb; uint32_t hyperv_ver_id_sn; - bool check_cpuid; bool enforce_cpuid; /* * Force features to be enabled even if the host doesn't support them. diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 6f21d5ed222..49179f35812 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -8169,7 +8169,7 @@ static void x86_cpu_realizefn(DeviceState *dev, Error **errp) } } - 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() ? @@ -8808,7 +8808,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 Tue May 6 14:38:51 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: 887801 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp2586534wrq; Tue, 6 May 2025 07:44:35 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU2O+eRrzDSIqnBbN9U3zai8Shx87nL6qwZLAvDeBqsYmCLtOvvCYZuL44JPZMQsnPkDxKomw==@linaro.org X-Google-Smtp-Source: AGHT+IH1HeVmt/OxA9JxcpaOx2MNFTUDBzKe3TLoVb5C2b7Y2q96QVKy1MT3bpDwOPfThkYg3/N7 X-Received: by 2002:a05:6102:3fa1:b0:4bb:c24b:b644 with SMTP id ada2fe7eead31-4dc6514bceemr2118006137.20.1746542675088; Tue, 06 May 2025 07:44:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746542675; cv=none; d=google.com; s=arc-20240605; b=dFAKFiOMuJow1xEPYng1h/p1qFrwOJBbFvpyw0ZXcxKmuQNVXWGqhQU66Q0x3DrER0 90IcbynCZRh8y3jzbwqC5Kh92DTd5m2L1B+rEqynySNUM3mCcaa4zwuuLDE7u7zrYA/j 0QeaqWybiAwZNfJ6C1dlA9PYTD/t0ebGjbkWLodsFMD3aeB97g+xnhxfzzXloRPlT10Q IUcVyqIqzRVAsV2Wvs4njvxAWZK2DfwHKboN8y6rztGiVobQxGfnPBlBoUk9768oIOSU b0u5xYuWP7UCiMlODLqGtHAv23PjXtZUKgAEnOFRwG4J1m1NdfRn9FyfdPGDSXPa3GRI YtFA== 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=Y41oplbkU9wFEHQN9IFbTeGkihP8bHFwwIYrwg5eFCU=; fh=XSpotKJkk0QjO1VgmGgsyK7nnDHNLw4NWZrdrHYPOSw=; b=k9ttos8qps1bllN12c2M5n2z/eZZ58lGVFbeJMlJvpBhyb1aU8UqFUHAfiGdNeBAi2 zFo8XCSZpIYkQs/cObDJmvIcZxbUW+VVAgNZSZEe9unFXnG2C4DYjdGr90VlvEBR/7L/ umFunmFUfW2Jkp8m56vuHn60IJhUrBAtavw46lGR2XVjBp+dly2yz9vxKgOT2OEciHX/ Rv6ugumAaw9eMAKy6ZOEZ8PbZ5c430IDN7i5S2ZUOhGkZNrN2YAK0xQuf+ZzmFnLkT8G ml/iX2xQxP+8jL8SfVvq+ctdNZVJhfKQFpkcjxp3kiurnfSjhniiWNt9wXPvnG4pCt91 BbOQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=iz0UvBvK; 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 ada2fe7eead31-4daf25c05edsi2309704137.492.2025.05.06.07.44.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 May 2025 07:44:35 -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=iz0UvBvK; 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 1uCJVb-0002Q7-V2; Tue, 06 May 2025 10:43:01 -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 1uCJSK-0006vR-H4 for qemu-devel@nongnu.org; Tue, 06 May 2025 10:39:39 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uCJSI-0001QE-2X for qemu-devel@nongnu.org; Tue, 06 May 2025 10:39:35 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-43ce70f9afbso50574125e9.0 for ; Tue, 06 May 2025 07:39:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746542372; x=1747147172; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Y41oplbkU9wFEHQN9IFbTeGkihP8bHFwwIYrwg5eFCU=; b=iz0UvBvKjols+D0ayI0og4g5WP7Kga/4VVi31ggAm13H5RW/oGWXjfwNwO7uATLReu 7L44enF+fs0ocEqMdQwtqf3wveuzskjj8mezmppzwyZFp1ck6olCeOCrM2uJdXlMyC0S 6WjpujNS7T/wDRYvZzgmfB8pTWvNM8v47KTV4u+BX2C7wA6kb0gLcsf6DSt7Qe7CH1M2 lDjil7v5IBWZQmaXGxRsfKPi+SeUkRUFv5ZErm46NDNGNW8c9COF2KQ6JnXlKMzDhOAQ lrkgSdqmbi2x0A6uU/VirfbnLl8JG0BHfjDs9v8w/+ggAQBrIDgSd/7tgY6iTx6WV1LW hBzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746542372; x=1747147172; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Y41oplbkU9wFEHQN9IFbTeGkihP8bHFwwIYrwg5eFCU=; b=DaHsX1bkY+tfcejzq6pzxp6XnjFPRFfYpfUfB6ov2EGFpxeoES/PV0e+4oImDX5Z1o aT7DlBd4cUsEqH8paJetoct6dZ9clAa+lJwyfLS1Nu0c55ST7jS5JFY7AqzNjFyjq281 OWFhQb1bw48Uik+DoSA9B01g6drUACe5NMITeCtofobvl47uvQ9aGTitE5yERPS83Tkh vELzJ+XVGdzz9oVmEjkSnLOeXJWOkeIXplMa84eRqRwxUNKNmRwCs1cgqHUE1jgbBEPh PS2FXQmt4FBIbbO6VeaQQFlOP6WbLq78B4MSvguhC2hZfxzr1uo69BJiEoUiDzpDgf10 4Qsg== X-Gm-Message-State: AOJu0Yzehc0DDkib6hO7TeeWVFSa91oxddojlIKIQoZWAL4tZ2VGC0NL RGHmt6F/SltS93P7O16ACnhZNek6ZezmK4RXobIcof2Dce3S81L0zcGFnS1CSXniYhvnNSKaY/b k X-Gm-Gg: ASbGnctdx+TEmFC2o8f3slPqSfjIx4/c8/VfA99mDPHtfVjn92O5A94VP/f+bQ7u0uf wjWo2zKD8H+JyrjGiPIIjtRnXBtBy48C1nkqJ2bQwWkHr+U/s+gwT4RPbNvt3cfoD9ROZeAD/Lu tvZxTgOiVaFxwpm0hOmjQ5uABMpQPtsPH4E31S32QVgqGmQcn8PXmt4Ouzhv4qNgvqCTb64tirK TD/9TDfZnwFgFf5ygsS5bqaP2iJnZ/VSA/dkV4MKGisq6fRobqz4Fz2Jh5Y88VlhvcZF4lqg+fk fTbHyA9xesMS3txbM/M562bWDSp0V1FaHCsW9Q5mM6C2b8cEf/Si5ESIwgniYiusdeLX475Oeu6 azFef/MHhj0eu8MR0Mx8N X-Received: by 2002:a05:6000:4312:b0:3a0:7b07:af9 with SMTP id ffacd0b85a97d-3a09fddf4e0mr8991925f8f.56.1746542371675; Tue, 06 May 2025 07:39:31 -0700 (PDT) Received: from localhost.localdomain (91-163-26-170.subs.proxad.net. [91.163.26.170]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a0b05334e0sm1887665f8f.43.2025.05.06.07.39.30 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 06 May 2025 07:39:31 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Yanan Wang , Paolo Bonzini , Eduardo Habkost , Fam Zheng , Hanna Reitz , Zhao Liu , qemu-block@nongnu.org, Dmitry Fleytman , Richard Henderson , Laurent Vivier , John Snow , Jason Wang , Marcel Apfelbaum , "Michael S. Tsirkin" , Gerd Hoffmann , Fabiano Rosas , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= Subject: [PATCH v3 05/19] hw/core/machine: Remove hw_compat_2_4[] array Date: Tue, 6 May 2025 16:38:51 +0200 Message-ID: <20250506143905.4961-6-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250506143905.4961-1-philmd@linaro.org> References: <20250506143905.4961-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=philmd@linaro.org; helo=mail-wm1-x331.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+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é --- include/hw/boards.h | 3 --- hw/core/machine.c | 9 --------- 2 files changed, 12 deletions(-) diff --git a/include/hw/boards.h b/include/hw/boards.h index 765dc8dd35e..5c4e3d2a2cd 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -848,7 +848,4 @@ extern const size_t hw_compat_2_6_len; extern GlobalProperty hw_compat_2_5[]; extern const size_t hw_compat_2_5_len; -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 Tue May 6 14:38:52 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: 887800 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp2586510wrq; Tue, 6 May 2025 07:44:32 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV5RfV/B5T4AqyYCnhpzwqIOMUcXKjN5PXDXBLqVlwTUm6IgmcHdBoWdCHuREyNL4QJgj1p8Q==@linaro.org X-Google-Smtp-Source: AGHT+IE4f7HqjWHcWZTrFDlNPopbnmUI21Up8ZZ1OejegW7qZoYZuntmQvBbpRh/3P5TzWeyqBAx X-Received: by 2002:a05:6122:1683:b0:527:c550:c06b with SMTP id 71dfb90a1353d-52b26b097e0mr2557066e0c.6.1746542672033; Tue, 06 May 2025 07:44:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746542672; cv=none; d=google.com; s=arc-20240605; b=YTXakSQFVpe/+M1iYJt4Ihw2IEvetdp+7oXi56DNUB9MSVixSOeKZlvjaITjJS6Pzx 9/gAnZFaniBfoCzUMSEamY1uXfSmpEWqIvVvKw0gZBUl+InKf4c5rNdOzI3qzsd7APuA QAivHMVLzBfI569tSq93Lg2s8PgQBBnPY2WDtTSubaKU0bCWkME8RrpJK7kGEBuwfHwo SXoXMH5Hi2wlE/6LclEFS+NRTPkWA0inEpaH39T+KfSBeVedwnC8cHE5eJuwoxcDqxTx 3z0IdU+I0h0ZyY1INPExqV97skAwFAEZMKOKtCRv/S8W2bR+PvfaAWS3U6NpzRbOEtWB 4h5Q== 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=D7M6Tutx3exMAOrtlWY2rOEtIIwc+eHcrkvSbvRNBy0=; fh=XSpotKJkk0QjO1VgmGgsyK7nnDHNLw4NWZrdrHYPOSw=; b=Im3mibxnGXPSzQHXx5F9s69ua82vPesXwfYQi9EkE7gmayRisrS53bRPEITin2M1Eg rslYdv7qtfu35eInBdJvCScCN+Zt5Lg4k036A/a5ma6v9RD+kruodoyreiAjwZ7NIg+3 yAJISMTTxgKo/zPpFLC8UcnH1uT7XqoWwFlXyJqHn2dJUEgtiNXxvfpOtMaIDANGyFZx vMb98TOidjzCQgdBYeuwfrxo3DJdAiiezITz51SrAnT0g5isGjmKsCq/UUkyN0Twnn2y aH5ahgewh1yaawAxKr55o9KFnNu4HkdTIMIFp+1B7jpm8ERDfctpE6zdDNbvUWxktSvC fKeA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=LtRH01AR; 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 71dfb90a1353d-52ae4193334si2728822e0c.247.2025.05.06.07.44.31 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 May 2025 07:44:32 -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=LtRH01AR; 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 1uCJVD-0001XG-Pe; Tue, 06 May 2025 10:42: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 1uCJSR-00070i-2b for qemu-devel@nongnu.org; Tue, 06 May 2025 10:39:44 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uCJSM-0001R9-Br for qemu-devel@nongnu.org; Tue, 06 May 2025 10:39:41 -0400 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-43cfecdd8b2so37357975e9.2 for ; Tue, 06 May 2025 07:39:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746542376; x=1747147176; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=D7M6Tutx3exMAOrtlWY2rOEtIIwc+eHcrkvSbvRNBy0=; b=LtRH01ARqIqKI7ohlPV45FH1p7Fn3tMGeAsyrll6BtGwcvhOKdtpf5ihqZ9IeloHuo 0REv1rlxgmJKOkRBxpMKiTOekfSufpebadX3VNXXanhSKuDInFH746IsE1Cx7aDLiDrY 89/qnczTfvZAsGypqsPa70CPrB066UBbrua6I92iHu0/ivhTqGywhIZc4ScVIpV2ATbU QWd8v6tmlQCD08zjyZHw+QX2pMcNCHOY93R0GOtRuTU0Uggd2JLiXUe9FdQ4P18QICCA EU6Phq6AUWoHifMWwjJbnQheJTxBDaCauzwBXCUjZ/f0dZJFoHxeGfWvYj8Yc1TDXqkf YBTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746542376; x=1747147176; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=D7M6Tutx3exMAOrtlWY2rOEtIIwc+eHcrkvSbvRNBy0=; b=uK4AOJAkhXpg6S/kghJIf6ZdH+NqFr41/Wy61TXzHXebHl4JzsR1NUDJdjf2E/ybfR wK6wMN67v82cbcrTEy5GO0di+dP17sxsK3H61bhLlajigYurfSr3dI4Cxvm80DDW9nLN m5untw2uszQWdCMIS+snhMasLvvGvNo9sizDcplY2GYuJ9ZAQjdBUhau/7tdskd8Zc/b Fu3oXrq/0G8+XTjeQ2P/rZsQOGvHNm9847cUJceWirEmFzBu8p8VACeH6BfS4tOiRf/i ghSCU5G7iaT+tndUhsTK9RJpuqxmJHk6GMvx8H2VO49dwTqQMrPB4v0dxoObRpvooBfG NbfQ== X-Gm-Message-State: AOJu0Ywy0YaYrM4wAMY639ndWBAPBJxNFuBkNeOjBMru5zqFTq0NG+bw K/ldyL3Myb7pvQAjo04gOLzC43pgVZFd6z3OLvPusXcAdMAlaWnL0WV9BbY0i5X45DG+nQJAl8u b X-Gm-Gg: ASbGncsts8dPZQz4bOv+UfM95IfBpQcQDxUdpxjA6w9vdENImcuDfHYV3KdTPJk4kKi WOWOu7bfS9eMNL9hZk8Ftbi9fJKuDRo6KkeF+KmpqqZmhBV8g7k7KdrG0VZ47xfPqG/3lia2uHW wcvhgqSenclqSgcPjxu0Q6Je8JblHm15xHp5gRg/LyZCI8HbgbAD7mYN8f0PMGt8z4Obhar7fpH u4f9CKkvq+C1n5x/fAJPhRFgij7pUDpof5GvqUHubt50FNIvgy9PZlhmW7yEE0PKvBuscF2qGnu c6L31nD4dW6yMlqhi2BHu9b1m8PuUBHjRTi/vVEDPIxLPJEAWoZU/xo2EbLgqzFAKu4i3Nm6GGz j+PhYVFVuejmxVj+QJdFJ X-Received: by 2002:a05:600d:1a:b0:43c:e70d:44f0 with SMTP id 5b1f17b1804b1-441c4a6741amr89979685e9.19.1746542376513; Tue, 06 May 2025 07:39:36 -0700 (PDT) Received: from localhost.localdomain (91-163-26-170.subs.proxad.net. [91.163.26.170]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-441bc83d471sm148773255e9.26.2025.05.06.07.39.35 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 06 May 2025 07:39:36 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Yanan Wang , Paolo Bonzini , Eduardo Habkost , Fam Zheng , Hanna Reitz , Zhao Liu , qemu-block@nongnu.org, Dmitry Fleytman , Richard Henderson , Laurent Vivier , John Snow , Jason Wang , Marcel Apfelbaum , "Michael S. Tsirkin" , Gerd Hoffmann , Fabiano Rosas , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= Subject: [PATCH v3 06/19] hw/net/e1000: Remove unused E1000_FLAG_MAC flag Date: Tue, 6 May 2025 16:38:52 +0200 Message-ID: <20250506143905.4961-7-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250506143905.4961-1-philmd@linaro.org> References: <20250506143905.4961-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=philmd@linaro.org; helo=mail-wm1-x334.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+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é --- hw/net/e1000.c | 72 ++++++++++---------------------------------------- 1 file changed, 14 insertions(+), 58 deletions(-) diff --git a/hw/net/e1000.c b/hw/net/e1000.c index cba4999e6d0..e0310aef872 100644 --- a/hw/net/e1000.c +++ b/hw/net/e1000.c @@ -127,10 +127,8 @@ struct E1000State_st { QEMUTimer *flush_queue_timer; /* 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) @@ -1210,54 +1208,24 @@ static const writeops macreg_writeops[] = { enum { NWRITEOPS = ARRAY_SIZE(macreg_writeops) }; -enum { MAC_ACCESS_PARTIAL = 1, MAC_ACCESS_FLAG_NEEDED = 2 }; +enum { MAC_ACCESS_PARTIAL = 1 }; -#define markflag(x) ((E1000_FLAG_##x << 2) | MAC_ACCESS_FLAG_NEEDED) /* In the array below the meaning of the bits is: [f|f|f|f|f|f|n|p] * f - flag bits (up to 6 possible flags) * n - flag needed * p - partially implenented */ static const uint8_t mac_reg_access[0x8000] = { - [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), - - [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_PARTIAL, + [TDFT] = MAC_ACCESS_PARTIAL, + [TDFHS] = MAC_ACCESS_PARTIAL, + [TDFTS] = MAC_ACCESS_PARTIAL, + [TDFPC] = MAC_ACCESS_PARTIAL, + [RDFH] = MAC_ACCESS_PARTIAL, + [RDFT] = MAC_ACCESS_PARTIAL, + [RDFHS] = MAC_ACCESS_PARTIAL, + [RDFTS] = MAC_ACCESS_PARTIAL, + [RDFPC] = MAC_ACCESS_PARTIAL, + [PBM] = MAC_ACCESS_PARTIAL, }; static void @@ -1268,8 +1236,7 @@ e1000_mmio_write(void *opaque, hwaddr addr, uint64_t val, unsigned int index = (addr & 0x1ffff) >> 2; if (index < NWRITEOPS && macreg_writeops[index]) { - if (!(mac_reg_access[index] & MAC_ACCESS_FLAG_NEEDED) - || (s->compat_flags & (mac_reg_access[index] >> 2))) { + if (s->compat_flags & (mac_reg_access[index] >> 2)) { if (mac_reg_access[index] & MAC_ACCESS_PARTIAL) { DBGOUT(GENERAL, "Writing to register at offset: 0x%08x. " "It is not fully implemented.\n", index<<2); @@ -1295,8 +1262,7 @@ e1000_mmio_read(void *opaque, hwaddr addr, unsigned size) unsigned int index = (addr & 0x1ffff) >> 2; if (index < NREADOPS && macreg_readops[index]) { - if (!(mac_reg_access[index] & MAC_ACCESS_FLAG_NEEDED) - || (s->compat_flags & (mac_reg_access[index] >> 2))) { + if (s->compat_flags & (mac_reg_access[index] >> 2)) { if (mac_reg_access[index] & MAC_ACCESS_PARTIAL) { DBGOUT(GENERAL, "Reading register at offset: 0x%08x. " "It is not fully implemented.\n", index<<2); @@ -1419,13 +1385,6 @@ static int e1000_tx_tso_post_load(void *opaque, int version_id) return 0; } -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 +1410,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 +1637,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 Tue May 6 14:38:53 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: 887794 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp2586201wrq; Tue, 6 May 2025 07:43:53 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVTL0dtUG3/onYJOEenvvCH83vMHhM3suZOXE3nJf1CJxRjPyhiom+4hjhXY84/Nj7DnqocTg==@linaro.org X-Google-Smtp-Source: AGHT+IGFZZB0YneZfsFDRgZAX46O3SHc3lN/8Ept7qDTiq86NdIbUn2DF9xShiU3VqZyTSW4F5UB X-Received: by 2002:a05:6102:2d08:b0:4bb:e36f:6a35 with SMTP id ada2fe7eead31-4dc64ff0be0mr2479385137.14.1746542633596; Tue, 06 May 2025 07:43:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746542633; cv=none; d=google.com; s=arc-20240605; b=P4DByML6YV2977TXo4Br0qmeBepyd8zY9e9Yax3JzULdQGxEZ7vqJ5FCxqzI4XR425 rphmLbvhKsLppX/zArxU1xcwD2jL2vXicyaXBwVwtjMi9VCsVaMWLxEtKeFT+F59Ml7z KlJnmeWQMbDTJpPUVtvX3ffgBiHyzLLBH1s/iarehzqgjRFHINi6/wEdwdiX0UnQhvNd htfUgiSVB77mTJXAiGtbb349c7OspE6CJCtb45Ef06tpCP/aOpDy+XpF7+XVrP3iKrAw te14BoFan9yMzh9AdyKfXQxbpc4Td8j3KGg+0RfrdmIffaTAn/iXQLoIGIBqsS7bNJD/ AZdw== 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=ms9JBoeprQUPiUptapCDzYpBSk9NyAFnoD9mnSvk1Zo=; fh=yv/UmZ//SMR7OMCPM+hEQ1cdGiNsmlJhsS8KuguVnUs=; b=D6spIRFtlSVi9l6QpKkA1ENO/gDbntibmY9wQAdeJXDKPtwr03BPYqUL8OL0qmfpLZ YfnOhP+Xp3e1DgAsIiZPpmON+JKCLYbxp2S+BItJRx/UpKHXjiNEgXciJl7W+ZZvZDNq CdkmZ5wNz+q1vVL+ozIwbO0Clteisq0uyVKOz8CrdQFjOYBD4aUo70vdNPlpOY28QWOD BqV1Olkmy+MksLWcna0YsIhfogOVQ5xoTchKhFyl2U5IqWT7y0JamnSRDb2Y0PIacIJn HenCuUYNyM6RZJSGFZlPJQK2n+iHR7POHfVhVOe+GUyjP3Q1h6pUeTVzYI/K+CZsv2Bn uK/A==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=SGcrTxIc; 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 ada2fe7eead31-4daf25002c0si2630337137.221.2025.05.06.07.43.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 May 2025 07:43:53 -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=SGcrTxIc; 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 1uCJVw-0003Z3-MX; Tue, 06 May 2025 10:43: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 1uCJSU-000733-3I for qemu-devel@nongnu.org; Tue, 06 May 2025 10:39:48 -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 1uCJSR-0001SE-K4 for qemu-devel@nongnu.org; Tue, 06 May 2025 10:39:45 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-43cf680d351so34833695e9.0 for ; Tue, 06 May 2025 07:39:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746542381; x=1747147181; 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=ms9JBoeprQUPiUptapCDzYpBSk9NyAFnoD9mnSvk1Zo=; b=SGcrTxIclfO5EuzzSgKMfcwt6D9P9SrwuaeHJ2+TZnccVZHQeHLg1P++a1C/HbquHf vgaBtpxj+OOUAZRkXFEy99AVObklxlStKJNUsRxRO4lS4TAINPMjR44iKqqBLRFZUchE JG9MVk1BxpQQvRxI2K/NckIOQ9Tk0i3prdVSwL5UVt891V3NoALLGl4w1kGldcP07Ue/ 6AqgVCjqb3IPap0o0XPa4+ToRcgcxCdtIeIlzghoOXLj0bweLol0lUq9J6CnetbL844D oOMYpP3kFkBa+NwPhYpE10rqvtzhJPCqqs1k81qbPnCaDB04sV2TSKaa2c5yYr+RT40U ulbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746542381; x=1747147181; 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=ms9JBoeprQUPiUptapCDzYpBSk9NyAFnoD9mnSvk1Zo=; b=CnTRKlt5O5AWF1MYgUAm5LKEafzCcDcxebOq4y3TU1lZNtSTmfpHmm/DBugMWYz4en CKDxkgwFWVDg+YUt6UEIqSc706+CzcUJImP1CsaQzwZ8k34luunpdozoXcMK82vlu/O3 3elLL8G83fjIjX8VgQs1DVkrX2G3O02cEnvYJpLhiLzDp9GzOHSbPhgubcO3HXCD+0XA BEqu87cDIDU0JGG/1RPiXbPW1iqF+uhbCVWgMkxT6rI5EcdRk9Hr8+nszz9T0/4iUbTB 7P6BH7UtJCdy4gJAJCNDgr0V3f6vwYYFeSo2k+tuZJrADo7Sg37T8uqjFTme8CjWdUyP Brgw== X-Gm-Message-State: AOJu0YwAVJP9CzKY4J1s+SsgRu4X+T24QJG/F/ipatjmsH6tP7iHzezq 9hscyKB2KJuyCrQBz67g/Ce77oS19KSjHHdrPL6bWTMURP7D9aZ6sYllYkSVAqQg+rLcoNhob2F z X-Gm-Gg: ASbGncti3xhI7qe/li4t2kYzTc3BYxt+YAVhIxvD0BpSfEu5UnsFpQWYNodNUPb3hRX Ftg4z9sUp4/r2qAt4ZQbfTpXfoinfTQvJc6I0zWnTOeiquQ3eM00i3VSV4J9DZK1Gg2SLfkaTGV tP9dJU2+qfOoxYV1CEvhwuPcO4HPqsx/DJ5O4T2FH3AL2cG6wwEkKm96ca4i0OKqNj3njD1U3cO rY3gSiZXx4660cl9V81Wy4PP6Udt8aB8ZBwgh1SndRLf3bR8S0hFf+NBk2OJCCWf87HmFDKZpLs XrkxqQ0rIWPjY7b1ZIw4gdGpzCMV3yn2zLPcK+xhukKBKCpRPmkoG/HkL627ovDjBGcMtZwzc93 +CG8Jd9g3XlXeWjnzsyrx X-Received: by 2002:a05:6000:40dc:b0:38d:dc03:a3d6 with SMTP id ffacd0b85a97d-3a0b43afdb6mr23610f8f.4.1746542381427; Tue, 06 May 2025 07:39:41 -0700 (PDT) Received: from localhost.localdomain (91-163-26-170.subs.proxad.net. [91.163.26.170]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-441b2ad7688sm219322085e9.3.2025.05.06.07.39.40 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 06 May 2025 07:39:40 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Yanan Wang , Paolo Bonzini , Eduardo Habkost , Fam Zheng , Hanna Reitz , Zhao Liu , qemu-block@nongnu.org, Dmitry Fleytman , Richard Henderson , Laurent Vivier , John Snow , Jason Wang , Marcel Apfelbaum , "Michael S. Tsirkin" , Gerd Hoffmann , Fabiano Rosas , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Thomas Huth Subject: [PATCH v3 07/19] hw/virtio/virtio-pci: Remove VIRTIO_PCI_FLAG_MIGRATE_EXTRA definition Date: Tue, 6 May 2025 16:38:53 +0200 Message-ID: <20250506143905.4961-8-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250506143905.4961-1-philmd@linaro.org> References: <20250506143905.4961-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 --- 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 Tue May 6 14:38:54 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: 887802 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp2586620wrq; Tue, 6 May 2025 07:44:45 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVyyFr4tDtT/ryVrYneHMs7i3MC7XMl+KL6iT4kvk2N1D7YB5E8OJKr7Gsnkk6n1+ImiT6B3A==@linaro.org X-Google-Smtp-Source: AGHT+IHqZosthV+7SMucci9IqbI061qLEhPyhzj6ixMhz4FTjrIipXoBIEsULxGwIIRdaa+NLJBe X-Received: by 2002:a05:620a:2588:b0:7c5:4c6d:7f95 with SMTP id af79cd13be357-7caf11bceecmr430157485a.48.1746542684955; Tue, 06 May 2025 07:44:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746542684; cv=none; d=google.com; s=arc-20240605; b=TWbBCvck9VpM492TirzOqaKJ4tCybhZG8/PRWgu3wEvegvcAcPHZHptppsLM/71F16 VOkqqPYscNRSWNT8cBBNevWb9ZoBR3Ur4rnqR2ryvoTpgjcathGJJLFsN6hDPm/7GvnX 6IM1Zh5d5ax+KSQv1RjFNBv92PhxYa6zk8NNEPzgUkZfNs0liqKyfJLl5htllW1Y/xOY ixdaxr90hSS0kcjYZ5AtjiOgyQt9qlc9AB8+llLXoxy5K25jwUJKS3PLRgssz7C6y18S cFzdFggh/J+/qzWXQd1Me8aDnYkxkXV+8O8d6izB7kCVXB8y8euW985XDEvRpw30fxoR c6sg== 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=0BkDThoIzdV48soT64XeZ7dLWYwQOfmi2dWyVwZ8yvw=; fh=yv/UmZ//SMR7OMCPM+hEQ1cdGiNsmlJhsS8KuguVnUs=; b=g0gbizW3phcos9cg2t0yeg39J5JM7vfJcUD79KrlhkzL9a0JwQyIxRwUoCM9z03neq yW6Xb+AKKW0PVrlbeW4dKJI5vFCOsTzuy4UQcI+tQCURsYky+exAMJwQhIyL+ryaVqKx WBDRmhXqMJOejivIuoB9DwcrFFnJc31/1EEes6OVJV0YoGqUH31/oJrWGQjhJ250WJvC NHKqJZ90n1uV01t+ZXPDNrGOB+0NlZzFmmaUlf7Rc8+aqoFgDMd+s1P+58FFQqFJLF3q hlgl/bk2qj641Afo3y0zrXJTytVB9ifdwc2k1RqVmahU3AVjibeRIjCEMX7jk7/RJAqp 7aCw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=L5T7lB1k; 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-7cad24557b1si1108909685a.611.2025.05.06.07.44.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 May 2025 07:44:44 -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=L5T7lB1k; 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 1uCJVb-0002QN-TD; Tue, 06 May 2025 10:43:01 -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 1uCJSY-0007AB-KW for qemu-devel@nongnu.org; Tue, 06 May 2025 10:39:51 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uCJSW-0001Ut-MC for qemu-devel@nongnu.org; Tue, 06 May 2025 10:39:50 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-43cfa7e7f54so35728445e9.1 for ; Tue, 06 May 2025 07:39:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746542386; x=1747147186; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=0BkDThoIzdV48soT64XeZ7dLWYwQOfmi2dWyVwZ8yvw=; b=L5T7lB1k65aXzizKf0jtGFNHk5kb/ssx60xTe2kNvNwa7+rYJ9ppl2zAxQFEXR6Sfr Rko2w07X4l9PAWFVjpqxXZTFDWDOb2Lw2Nw/Xw2yMnZcqJdesfeWLEc755ZULpzwT7bH 8vsOOYflYF+zA9AGIdochWthEVc9Ee8N3XryeDUOQ5R5RuCBpXs9VSBk3jSpL9/Qd4mG eQaUQVsKFob3GKfxedQxTUG8k0A2QLfyWc9vNyieCyjs/COuuG+4WoT/3z9sTBV8zYmg I6kNsmjvZYd9pfEBOpfTgttuDp5LlycILxK+5NIA0O/ZOW8f+2OoWv9zZm4gJoGjnrAv wPPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746542386; x=1747147186; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0BkDThoIzdV48soT64XeZ7dLWYwQOfmi2dWyVwZ8yvw=; b=YlLxBMi7EjOqrOFi+waSaxt5rZ8H5x0ogI1ELE/gQIggLQjWtgiArkIP1QqjZ0+b9F mGxYt2Ar7b31wCyFEbAWV9XJiJZiMlJ4xirXZw/xXAr0c8lWwnfUsFta2scnA233EPpm lF7GMIAPkJTs/bSsayRIyTPe0aTSN8K6AJIHFeXB7tBuzBlwH67fCqr9rRs5HATOXohc ynsynY3Yf6qpWT1AfvOguew7hisfBB+iaBX8c/wWY+DkjqQTLeikIYo6sZbKMdqdFVXC EqZ23V92HeCJVGnw+E5ZJfV78LStgzCA2gDh11xTIxLx5LyyEeKzypjquJSdGyvognxd pghw== X-Gm-Message-State: AOJu0YxibXq0rrOgV4B4R+H0071aUl4W0FApvuEwd20hx66P1q9JY2gq 0YVOzkVRV1IfBv2/KL9VJDDw3Ni3KiYdAmvwe5ElqH6P2AqTrXR4vOMCm5oRMnFZjSkuv5RJ/YH S X-Gm-Gg: ASbGncuFrE9BhQRSyAfIfx0TSHayNyGUQRrqRe/0sm7uCQbAwnQCDW4DJsm+KPI3qjl 0OlrbEYm5+SU7UP+17SlIZi7LLWuwPuA1o56XaWWDBzAAbcQlCU0rGyOHJ/l+hRs3Pg+lFGHrC2 1ws6YdLbtKcF4DSySdWcER+tFv0LYDfp9Fq1x6IGm46b7HqrC1CaDIRiiH54QnOYykpC3093l0l Y+MTZqpprgJQcrcrHV0CsNW+vaP9FFqxxqMdxMkx8CqaHfYto8F1YvjtMeFJBAhw1uh3/t9nLbw yj8j8kH0Ap7poCTASbze1OtaWOqNCRIxS5XWvaJcELNiD7sOo2YB5Z6y70zlo9TuaPYoHHil619 tTLuH1VNVEixjU1yCc0Nq X-Received: by 2002:a05:600c:860b:b0:43d:5264:3cf0 with SMTP id 5b1f17b1804b1-441d3a6e1f8mr132225e9.11.1746542386476; Tue, 06 May 2025 07:39:46 -0700 (PDT) Received: from localhost.localdomain (91-163-26-170.subs.proxad.net. [91.163.26.170]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a0ad661602sm2342151f8f.61.2025.05.06.07.39.45 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 06 May 2025 07:39:45 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Yanan Wang , Paolo Bonzini , Eduardo Habkost , Fam Zheng , Hanna Reitz , Zhao Liu , qemu-block@nongnu.org, Dmitry Fleytman , Richard Henderson , Laurent Vivier , John Snow , Jason Wang , Marcel Apfelbaum , "Michael S. Tsirkin" , Gerd Hoffmann , Fabiano Rosas , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Thomas Huth Subject: [PATCH v3 08/19] hw/virtio/virtio-pci: Remove VIRTIO_PCI_FLAG_DISABLE_PCIE definition Date: Tue, 6 May 2025 16:38:54 +0200 Message-ID: <20250506143905.4961-9-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250506143905.4961-1-philmd@linaro.org> References: <20250506143905.4961-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=philmd@linaro.org; helo=mail-wm1-x331.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+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 --- 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 Tue May 6 14:38:55 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: 887793 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp2585800wrq; Tue, 6 May 2025 07:43:00 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXA2fejr+1Zzor8YXkFNd8oNBqMcGovFGqJqIcjaaQEEj9XZlahlE/2NpRT5UG1S1eQwdFIMA==@linaro.org X-Google-Smtp-Source: AGHT+IGNXtH7ZlUkt8qlymnDdJORz5137Z+Q+jOY8HoZccjs+VAP+ZiY9pv78EMrsTlPZAQ/GWYx X-Received: by 2002:a05:620a:8010:b0:7c7:a5f6:2633 with SMTP id af79cd13be357-7cae3a8845bmr2209059185a.6.1746542580633; Tue, 06 May 2025 07:43:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746542580; cv=none; d=google.com; s=arc-20240605; b=ltbK4ZTfg1W4G0eXKddZK3Obds3ouxu0VGcrL9luT1y2bSM62Oxv/3M1hUsWzGJvSO BpNA30dVCx/Txg3Lm1Gp+zq9ZjKwckfVS9miqWUB5P0pRVmHPEqW6FDR/1twhgyK+any VMCOQ1kmFko3RHPWUkiUo0hbSibKjRArVT7BTkk3feULZaqzGpgC93MGb9wts6WM7nq1 X9YOPCj9kNPBffoPkcmwZ89ZBLgq62nbPvyxRY7I96USq18XFowJgEkxexaMbeJnWJsT XCVNwXCiBPFT3R6yBWqsCoI5pii9JZ0J2pkmB82Ql+Mf92zmEh16sBOwLVEIBzrcoEaV 0AIg== 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=0i+gB4qGYdD+t3Cj9VGzIhWK4paiq4kBCZvxw2YhKv4=; fh=XSpotKJkk0QjO1VgmGgsyK7nnDHNLw4NWZrdrHYPOSw=; b=JSyzUrb532cxHnnRg56RBu8RUVGzTS8OgR/6LW8ssmrGZsRKphBPmzsh6czDn7yrE5 pjdbVIQTgvn18IQyPokCgf0VVeGdnreO63rOML7E8haqPg573odwYfv2LPJNPNkGo2Ca jP0eLejIanrBjlYdVuYbvefy5n8f5jQ46lNKWUnXvKpJV3jLFH2gG95QgG6hIC/GL3TL izXankP2r49hdpXxhbgRJnUIf1u6Swe23VGZ6FBHVgVXDiE38anvGtPzMYmVAny7eSH5 Mw3BNl/ox9zbu0UFf8vfHEMBJ0wYkTqY/vvcMyH+O4wNV8PUaDQ10f4gD5Tay5Pt58Xf rmuw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=REai5aO3; 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-7cad244a496si1149629185a.578.2025.05.06.07.43.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 May 2025 07:43:00 -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=REai5aO3; 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 1uCJUk-000196-5q; Tue, 06 May 2025 10:42:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uCJSh-0007Xv-U7 for qemu-devel@nongnu.org; Tue, 06 May 2025 10:40:00 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uCJSb-0001WP-Bs for qemu-devel@nongnu.org; Tue, 06 May 2025 10:39:59 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-43cfa7e7f54so35729305e9.1 for ; Tue, 06 May 2025 07:39:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746542391; x=1747147191; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=0i+gB4qGYdD+t3Cj9VGzIhWK4paiq4kBCZvxw2YhKv4=; b=REai5aO3dhTbWXYJb7yE7QzM/PHK1ALrqmNcBwuAjCIpwiYEZArKXztJuktcHcK1FV qIxQrgfxyBLvAU1AZr9cI7fWwOSqezsXopLLUHuHTHKDXGvBpZRYRrbZ4W/7qhD8oWlb DO8NG2B2T6/nVPN/PHecKmEcaSScddqyMdUNnz43FsiVCRn/iJsT9nRk3IYOGhr/RUuk TlrgnuzWtVDr38wp3rF0+K+YBnc3Q+kbIRo52w7X9V7Krgt4/2PU9nUz7CLgo7pbsm+x QiMARyOVub4obi18YbfltPunea+rxEAJeDDmLIFj9WvqRLEBdYhaAa5/LWkY0VxtSyIm rOuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746542391; x=1747147191; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0i+gB4qGYdD+t3Cj9VGzIhWK4paiq4kBCZvxw2YhKv4=; b=NdNc9jPrgU5CZmUoganAD0baSHWghd854coHJDeNLILuwEFHF5oxyVf41AFDBpdhLr coYAvSOT53XEUBRLdGjKv6mM/bRHrMQXqkIdvxN95ss3e0Mk9OSdsbeWiOmdFDeWGgWK T3hWZA0WJlqcUmi4LJ7+scYMednnI7F0hzSU2gg26wGXIKL01CEscHV5iNXQ2WZF1/ER ZW17p5bIJMkfDcxuFOiPRi81eEHjfAAE9YwGAEvIoWWWnuhtKYgceJnNHPCeVPRK9juX Xwr1bR2t3tvcEpvISawygppAmIExo72dEZ7U580L99vN4I4yCVQLOAPrjyleP7xunOD7 zV6g== X-Gm-Message-State: AOJu0YxvFmSdsdp1MjoKHNsVbTm2kZ8/fMl6S7HMZgzy+m5+1k0IUwsO APSqyyrzWDC3naJqHIloZ9DYvMycJe/tSF0jLwX+fE3fJkq+6dRTNiV+QnbhJnnV3cyh1i/pLsH z X-Gm-Gg: ASbGncvl2bajPnX+U8zjHL+3ReNZipMesS5jNFta5bL7yitNJ8uDVNeEmklxyxDl+ak 7hBOEeK+gIlqxMJQ4evSY4PMPutr///qi8wnaTCPcDpywpw5ccqK1l9UBisssUyR44Uv2ZxzJAR yCq17VxJgPdIfTZlWmi0MVcn/ZuA38vdaOah5AURYd9K0kg5zvIPxupK0WwwEAG5QHRpIuq25Dn 3EH5+6f5JRq5nMO2DbvKy61HRRftsEZwzroEafQ81yk+3NR+SA5J/CBQVuHwFhGrc9wBgcJmHaO 2X+S8cofNiYxE6+vrejPOPcCAELJ29U8/dJmFUciKmvSggl1uRRyQ2ygNBlmVxoiAmeiQ0HlLvN h6MTJe4KOPkLp5zI34K1w X-Received: by 2002:a05:600c:35d4:b0:43c:ed33:a500 with SMTP id 5b1f17b1804b1-441d3a6e140mr138565e9.10.1746542391279; Tue, 06 May 2025 07:39:51 -0700 (PDT) Received: from localhost.localdomain (91-163-26-170.subs.proxad.net. [91.163.26.170]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-441b8a2874asm170469245e9.26.2025.05.06.07.39.50 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 06 May 2025 07:39:50 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Yanan Wang , Paolo Bonzini , Eduardo Habkost , Fam Zheng , Hanna Reitz , Zhao Liu , qemu-block@nongnu.org, Dmitry Fleytman , Richard Henderson , Laurent Vivier , John Snow , Jason Wang , Marcel Apfelbaum , "Michael S. Tsirkin" , Gerd Hoffmann , Fabiano Rosas , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= Subject: [PATCH v3 09/19] hw/i386/pc: Remove deprecated pc-q35-2.5 and pc-i440fx-2.5 machines Date: Tue, 6 May 2025 16:38:55 +0200 Message-ID: <20250506143905.4961-10-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250506143905.4961-1-philmd@linaro.org> References: <20250506143905.4961-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=philmd@linaro.org; helo=mail-wm1-x32d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=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 now unused empty pc_compat_2_5[] array. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrangé --- 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 Tue May 6 14:38:56 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: 887808 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp2587416wrq; Tue, 6 May 2025 07:46:17 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVlFFHxEISgrr1WLlCgWv3Mh+r3ObpDe9/QemXhkJ5VD5BTd6/5aFKSTsLSZCI827S9T++CiQ==@linaro.org X-Google-Smtp-Source: AGHT+IHKnUeW3d6B+RBY+kiIQc1IJA8e9QN8ujwobaGKQCacJvZwL+P8SLfrey3HRuWwlYVjLPGD X-Received: by 2002:a05:6102:15a5:b0:4b6:5e0f:6ddc with SMTP id ada2fe7eead31-4dc71f77b8fmr93844137.14.1746542776837; Tue, 06 May 2025 07:46:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746542776; cv=none; d=google.com; s=arc-20240605; b=Brtp7Hh9hzL8q3a+PUWgoSkiFUl0hSEc2cMju4fVRAwC8o5s7MDuHpLT3Q4lenrZ3y gMURHkYoWZW/QdhojN/xlDZVrpKxzc1QnEHHO7EQiwyATAVrqaN1qzJcL6TVY5GcbqbE kQsSSMOk2cldec5nnjaDi97tutFtM8T+3llOtP3djnGzKN5r6c+D167DaI7Q9m3I7y3x G8FbDfMhd+d4nQ6MgP7Yxzw8O6xY1JzhQZYTELHbAekfxMHnATRH4zFx/hiY/P12/luc bBmtm0jYZb6uG7W4ieOP0eCijup8s+BFuub87rwUCraO2/bTo9aAu+DmZnsIPZR+qLyE wWmQ== 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=Q1RXK9TNZCyuKZFLBANjjuVrJLcCqvX//mQ8ZqVm0L0=; fh=yv/UmZ//SMR7OMCPM+hEQ1cdGiNsmlJhsS8KuguVnUs=; b=CU1QQ6Q3bcutUTMBMVfPHB36VCCYH6lG6kqXqKe26s3JqVw5QFwnBe/iwBu076soLz VhfNS1ZiTJwsDGZazvu56f/EsbO98YfZEkfPpHKHyki+jM0zwucfbizK2+dO7v50eDjZ EkJbaQB3cjrDrgaC9SkPES6H5Oi6ddRHTP1mvhVmrQ5xOecT6GtqKxjpMT11ckgt3Tz+ +sdFsft3hWZt41F9LUwUN9gyJJkHl92zv5w89ICl2ZrzONR1pTNA02hs0D/vTDG5YZXV eovP+HxNy9J9Kj/RGeVnd3ykYO1ehiljz1GwadR9wBP1/GVENAVWIdpcfdN3T2Gn2ssT Vy0w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=lPIn0szn; 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 ada2fe7eead31-4daf2626a2dsi2444179137.625.2025.05.06.07.46.16 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 May 2025 07:46: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=lPIn0szn; 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 1uCJWA-0004Xy-P1; Tue, 06 May 2025 10:43: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 1uCJSj-0007aV-81 for qemu-devel@nongnu.org; Tue, 06 May 2025 10:40:02 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uCJSg-0001Yk-CO for qemu-devel@nongnu.org; Tue, 06 May 2025 10:40:00 -0400 Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-39149bccb69so4504843f8f.2 for ; Tue, 06 May 2025 07:39:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746542396; x=1747147196; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Q1RXK9TNZCyuKZFLBANjjuVrJLcCqvX//mQ8ZqVm0L0=; b=lPIn0sznahDZDDe7BYqabLiBKAA9ymwoqngRDLGU8Lo3V0UQEcTAoz/TbMOypck8h9 SKHlX4DnNSARGTpzXc7X/5lYJy0UANPlMj7jgv0+Hlzd2Pao0NnT6Zzeo/vWpaTxnfRn 7/9OtU7kdRjrBvOFYwM4PD+pKqRDLr2eT2z77LJu+nzl6besAlNDSNKmcucl6HWgolK3 277Fhb9uHUbDNEuqG+i9CFZetwFoer2GvEPtzee0Rb6m2gLwB77fOMtwVmm+XjGtMQjU pOR47P5IqZv0yULdjrdskkP+AjXE/Unx7WwpFtA/0l2JXacw5WeAIcrY+D1ud3S36TGz X2ww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746542396; x=1747147196; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Q1RXK9TNZCyuKZFLBANjjuVrJLcCqvX//mQ8ZqVm0L0=; b=LoHlU/YkEZ2hU1H3IbKTvyHqIIsLijx2+daCkHgMX9fnV2LjBPuU5KeRv6V05guySg T/yahFave8nLQFKS+fgouV0UCZOBzptUOibxetxqU/6C7VeezQ+F9dHhvg1+DSLIPfd2 ohAwDdI0lYaaXkMCbWYS1NID2QI4it/BX7A8qy+ffIP/HaPcRiBoVfaoPdXFgFheD8mC LyL06tdVgLXR7vp9MnVjGxd3NzVUrP1ikPajbWE8P9ztcAibra3mSsPOouIesSKefahm 6m/N8vrnXx4ywVzWLzFnPAFT7LwytOPN1dUu+mg1YVgv8FromokZpdf15j5yzKZd9666 Gxig== X-Gm-Message-State: AOJu0Yz8yeJsst5wF1UOtK/sbYcS19mxN+/4bNuWcKipGzbHRJKuGIYM LoatlmFew3ngcmcfiArNKcoNWmJTmkHjByuwmsvWWPTV+xfIn2LNxGJtmmqcG+QjQg+8JdjyOuJ h X-Gm-Gg: ASbGnctTQ93OqybAq+4hMEQPzZk4bCDzgbhSvFNEy++/bRFBAuVKPrV6EllhnblxheU FpqQwJ4uiAyAqaOO2+j35Y36tg9hN+LVih9/OFjEzw/whpVQAxx8qJoZBX9otpyKttpWTiwyt0x ds37L5wgxtuqpN5RFihkuV/EaBJKX1XtPqLV3cqWPPisQIezFUK63oLOquUjrpihDpJ/AezC9ld jtlGckbpZ52vIItop6OhQdj5XzH8dYL9d3y16rywY+0khTEBn+XJiFwocGWjMI+NiqsHQ/e8Xhr GG5eAGcK1+bCkQVCLz7EbNATJU9wLHM0ZPjBj3ZVCb7A0YYTt8WD8IktP+MYZc4Q+SUsyIwNKWe l4oMX+7GQxKeYgcIMeLCL X-Received: by 2002:a05:6000:200d:b0:390:e62e:f31f with SMTP id ffacd0b85a97d-3a0ac0cb822mr2943505f8f.3.1746542396130; Tue, 06 May 2025 07:39:56 -0700 (PDT) Received: from localhost.localdomain (91-163-26-170.subs.proxad.net. [91.163.26.170]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a099b16f9dsm14155699f8f.93.2025.05.06.07.39.55 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 06 May 2025 07:39:55 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Yanan Wang , Paolo Bonzini , Eduardo Habkost , Fam Zheng , Hanna Reitz , Zhao Liu , qemu-block@nongnu.org, Dmitry Fleytman , Richard Henderson , Laurent Vivier , John Snow , Jason Wang , Marcel Apfelbaum , "Michael S. Tsirkin" , Gerd Hoffmann , Fabiano Rosas , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Thomas Huth Subject: [PATCH v3 10/19] hw/i386/x86: Remove X86MachineClass::save_tsc_khz field Date: Tue, 6 May 2025 16:38:56 +0200 Message-ID: <20250506143905.4961-11-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250506143905.4961-1-philmd@linaro.org> References: <20250506143905.4961-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=philmd@linaro.org; helo=mail-wr1-x429.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+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 --- 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 Tue May 6 14:38:57 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: 887807 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp2587335wrq; Tue, 6 May 2025 07:46:07 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWqNvRMH7CXEQSecemK5u34GL+UMz1Dn35Rq9d1DZDR9i1YKuOEFOS8OKktXauqDUxnUoh+QQ==@linaro.org X-Google-Smtp-Source: AGHT+IGFtq+zl1DQjyncbqe8CdaN4BL/uxnOKRyPBdW1Zb6hD7aDY3s5GDUvaRqGt+Vern5D2Qvl X-Received: by 2002:a05:620a:410c:b0:7c7:c6e9:963c with SMTP id af79cd13be357-7caf6ccd44fmr9259285a.4.1746542767219; Tue, 06 May 2025 07:46:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746542767; cv=none; d=google.com; s=arc-20240605; b=cYTQ1VlP5GGApGXHm69cKVJ4St1VkfdCtgLeLkdykwzlYq1ra8bJbeov98nJCsFVst 54hYGqZqM1Yj4iYMoR81s41RM1PGq+vbhRcfWhMpB9Y4GJBRYroFTarNeGax4uIlZSFt +eb2/NLNTBsl0oijDJnEKe5uaKEx3M62jYoYkbdEEYHncm3nND8RuaiML1qQpgXJ622T x7Si+hMg1A7QdwwxIOSEmqVqc0C12bxPX9BN0O0ygG63tPVkOALB5yj02qcLRb6VGOAW zXD7ePQpLQNPfj944Dte3aXnxJT+IWLOxEU8K3qUcEqQYABLZr2H/k6NsQ6kuMozOryy kxCw== 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=lOi5amPs94CRFUHcijuRRBsiadMoOd81cUGdXDypUyk=; fh=XSpotKJkk0QjO1VgmGgsyK7nnDHNLw4NWZrdrHYPOSw=; b=ha8ROo/wygqspGeb2zYWURSJpNETIHcgI1rU6hTYvSJCBlkiy/64VHujTqY81BjBhd CUvdtg1j5Axp0LjRfUIw04A6VnFcduOEtcPf59lV0KqwMy6xiBksWF8qopGWDLyamSp0 /Z0vxWDcWq+Ml4VO3U1+dft4NzfodcRfc2J0nmkqAaYUaYTBFOjiRBYMqh9sMBcUZGPp K5+sLy7lu1EZ2cr2gJsVSiZdXCFXmRtBOy4aZnlvjLvjfhZdIqBQB51OdWIfYaWmiIco fdmC/iwyYLDEKKYqzQRPwpyVcg67oa2QhszCsfyz7IQCRqDNWcORf3q7k25UaMZqEbJh 3wpw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=x6Dz1mqE; 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-7cad241be0fsi1145986985a.276.2025.05.06.07.46.07 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 May 2025 07:46: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=x6Dz1mqE; 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 1uCJWF-0004vT-Fk; Tue, 06 May 2025 10:43:39 -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 1uCJSp-0007lG-Pz for qemu-devel@nongnu.org; Tue, 06 May 2025 10:40:10 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uCJSl-0001bH-TF for qemu-devel@nongnu.org; Tue, 06 May 2025 10:40:07 -0400 Received: by mail-wr1-x432.google.com with SMTP id ffacd0b85a97d-39bf44be22fso3915675f8f.0 for ; Tue, 06 May 2025 07:40:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746542401; x=1747147201; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=lOi5amPs94CRFUHcijuRRBsiadMoOd81cUGdXDypUyk=; b=x6Dz1mqEs+4STOSwvdNdRlgOkvzOoUK9EAHXmldyCR476SJj+EH02kizA5NGBp0KqF swgmbNsfcSFKD24CXv/cJ+QwME0dMBnO4dj+vzdvoDU4MGlCQnVzxXD0IeLGjeSzIStx 3ojJA3YtatUSNb+8st6fEItrtnvkZE8gjgoVDjPh9fM1VBufwPWMeVfhy/2Mqbv0LarO V5xwDKTRyWlb+Zmn2RSjeXpXqtk8AuwP+fgqMhcyJMYRULuBBcBUV6n/mSz7IUwCB/FJ D/0UkSoW76g2Yhd9qa3QVWW/AFKL485aZVuIa7eb4eh3t3PM9jLPvh8ctfzyUAMPCqnf 4IaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746542401; x=1747147201; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lOi5amPs94CRFUHcijuRRBsiadMoOd81cUGdXDypUyk=; b=wqu7FbQOj6WACURyfqpIIYWdG+oYBDVZTk/Iv9krZixctWOf69KYn7mk1Y3D5B2TvL J86lRBytLRkl+8esMmY71IE/h4wBqiyX+hjnFlbdq8OXwaOoUolT3dGL0020vSYiFZe4 73syGXYIeBInZMIEVSGVhj/APDUqVbCNoGkltp0DCR4JSAv4mVQO7BVSgtB6CaZjRgfy x2hT3IL7sPmWRr9bDlPv4nEIwfTWrqM6E8n0KiybUOlMzC7paYKQGAutyAPMCnDck1cY MMhjpk7bqb/v+LfiDjR8vwNqTihROXoAqhypp/GqT+HqjOpWLzZV11nw58vFEk/Yd5HD jgPg== X-Gm-Message-State: AOJu0Yyk0ybKqyMNpRrHDLbhF9QAhfbBN6CEPxdrY+ZBK+940nM7rCXV Xw7JiZ1vcnVPTYsejG18ZF4ODsFT4sDCC1dQejHR/KyhLGpbkIzk3KUcaSlU9WjEbn1K/l51S4p y X-Gm-Gg: ASbGnctI0zn+SUmAdnfcQtJ4ayQ1NoxaXdMEWD96uYEtfvgwXv1WSJRrW6Yme51DrTz iTjVCkjz/C2/iPLSXM4eePzC/UeTLelXSKfEPwR62wlDIcpxj0jBeZQX4yKvwt5lKx1Lbk+HoF9 R8tfo+Y3fEqJ1YRZpvftjeg2ce77+JzghLJSshZ7Yl9w9wa2QUrj/uISibfMXV8TAI3yxDFuNg0 y40i8yJxD7reJUdiWVnMJfy/cK2dan4z8W0ubeGVLkUnyxqgIV2UF3kox8e8ttm1NNFgUH3i2KN Cpe1QQc0z7yy7M3OLGVD8nkM96bHkNDK634QpGtaVTcmKIVD0psXubcAXjF0bRxkYLV7VtpTDl1 M1OSpq6U6VdjQrGvIsLXm X-Received: by 2002:a05:6000:402a:b0:391:4389:f36a with SMTP id ffacd0b85a97d-3a0ac3ea243mr2564048f8f.48.1746542401006; Tue, 06 May 2025 07:40:01 -0700 (PDT) Received: from localhost.localdomain (91-163-26-170.subs.proxad.net. [91.163.26.170]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a099ae7bbesm13657933f8f.49.2025.05.06.07.39.59 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 06 May 2025 07:40:00 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Yanan Wang , Paolo Bonzini , Eduardo Habkost , Fam Zheng , Hanna Reitz , Zhao Liu , qemu-block@nongnu.org, Dmitry Fleytman , Richard Henderson , Laurent Vivier , John Snow , Jason Wang , Marcel Apfelbaum , "Michael S. Tsirkin" , Gerd Hoffmann , Fabiano Rosas , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= Subject: [PATCH v3 11/19] hw/nvram/fw_cfg: Remove legacy FW_CFG_ORDER_OVERRIDE Date: Tue, 6 May 2025 16:38:57 +0200 Message-ID: <20250506143905.4961-12-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250506143905.4961-1-philmd@linaro.org> References: <20250506143905.4961-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::432; envelope-from=philmd@linaro.org; helo=mail-wr1-x432.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é --- include/hw/boards.h | 3 +- include/hw/loader.h | 2 - include/hw/nvram/fw_cfg.h | 10 ---- hw/core/loader.c | 14 ----- hw/i386/pc.c | 7 +-- hw/nvram/fw_cfg.c | 109 +++----------------------------------- system/vl.c | 5 -- 7 files changed, 9 insertions(+), 141 deletions(-) diff --git a/include/hw/boards.h b/include/hw/boards.h index 5c4e3d2a2cd..5dc5e3b547d 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -286,8 +286,7 @@ struct MachineClass { no_parallel:1, no_floppy:1, no_cdrom:1, - pci_allow_0_address:1, - legacy_fw_cfg_order:1; + pci_allow_0_address:1; bool auto_create_sdcard; bool is_default; const char *default_machine_opts; diff --git a/include/hw/loader.h b/include/hw/loader.h index d280dc33e96..c96b5e141c6 100644 --- a/include/hw/loader.h +++ b/include/hw/loader.h @@ -270,8 +270,6 @@ int rom_add_elf_program(const char *name, GMappedFile *mapped_file, void *data, AddressSpace *as); int rom_check_and_register_reset(void); void rom_set_fw(FWCfgState *f); -void rom_set_order_override(int order); -void rom_reset_order_override(void); /** * 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 520956f4a19..dedd555eb87 100644 --- a/system/vl.c +++ b/system/vl.c @@ -1191,10 +1191,7 @@ static int parse_fw_cfg(void *opaque, QemuOpts *opts, Error **errp) return -1; } } - /* For legacy, keep user files in a specific global order. */ - fw_cfg_set_order_override(fw_cfg, FW_CFG_ORDER_OVERRIDE_USER); fw_cfg_add_file(fw_cfg, name, buf, size); - fw_cfg_reset_order_override(fw_cfg); return 0; } @@ -2744,7 +2741,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) { @@ -2755,7 +2751,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 Tue May 6 14:38:58 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: 887812 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp2587877wrq; Tue, 6 May 2025 07:47:11 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV9n0VCQUI1zdt9vezun3wNhsiL94e5iPR5LWWz5aWvpAx2All01eFejXjMRz1om/dv4ifNiQ==@linaro.org X-Google-Smtp-Source: AGHT+IEuUChBvP0YJMMnX4dR8y/UhBZDRvPx1SwovE157Fp7w4KZUKv7HVxpR5HButXqgq++u0ci X-Received: by 2002:a05:622a:a11:b0:48e:1c13:ecaf with SMTP id d75a77b69052e-4910c48af29mr59842201cf.16.1746542831519; Tue, 06 May 2025 07:47:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746542831; cv=none; d=google.com; s=arc-20240605; b=Qmm6bLxOdDPdrtA25xPA7aM2eiVhT2byupYePwAwb9Btla9ERDBZshUUneeGo6Y+Sn NIeN94tjkzjtTY2GedgRQ3WRI0faRKHMPq0mGYvEMFdH5Cn7CeZ0L1ZpiGVGV/Et33SX YL8qnf5AisZuhhxXkqfsMgs/uu6FrFXYnNoZBYA1hB2MPCVcc4eJcaMHFL2BNahKYbqD czhS/K7JH1YHmdO1eJ6CU+tMxszHMOD85pwCilkhEJHPK+ddBJlbmVuitpg4t9zIY8EJ 7FEoMwEn5mZCsk/lFPa4dZRHBYx+nUvvp8jXMVvPq+0r2y2d5GFyC24kMK/gb3aLhhD0 /Xdg== 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=eXL4/W2KCy0v23MfOskz73x1LQjRcBzqdAtJsMYaNnI=; fh=XSpotKJkk0QjO1VgmGgsyK7nnDHNLw4NWZrdrHYPOSw=; b=Ds0YoX6Gfda56qlOD+gKvuu46PK17BqkaA2Psbxse8GWqsjRllpnvCeJAJPZW+RbD2 zOEQA1opvRzVJBh9MyzJBnTQjknmWOEVD6znyTVVum2+LFjwU5h9BLoPvhwBKDYAaetM H3wEUJP2kPBeUtdM+Q1LYDS4bN2c8liQZ2IvHHrveH0/a3BvnPchQrGAAbQOFrjIAybv WsHzv2YKHHbrkIaFW9ZOrjPOCgNyUQD4FVl212hJ/5fO+wXftk1R0odZJw5JqBysJr+J SK/Ag0qDdxsp0g5NdWXyJrUyfeenRUy+6dpGqHGVjxwNWHKNge7aDOruH/UgRWsLzm/2 pk3A==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Gppb0pCW; 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-48eceda46b8si57999151cf.122.2025.05.06.07.47.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 May 2025 07:47:11 -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=Gppb0pCW; 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 1uCJVl-0002rW-L7; Tue, 06 May 2025 10:43: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 1uCJSs-0007oO-88 for qemu-devel@nongnu.org; Tue, 06 May 2025 10:40:13 -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 1uCJSq-0001my-C4 for qemu-devel@nongnu.org; Tue, 06 May 2025 10:40:09 -0400 Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-39c0dfba946so4746878f8f.3 for ; Tue, 06 May 2025 07:40:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746542406; x=1747147206; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=eXL4/W2KCy0v23MfOskz73x1LQjRcBzqdAtJsMYaNnI=; b=Gppb0pCWn9sg7bMjFrF+BUX7UzfGkElZ3PyQ4tBAW6c5WjJLkebCeVYbVhe5B4xyXA RVqZy8ITBXPPTHKaNDeQJZgBUMZe3XH+W11np+wdsvKvmGSU+QhMoSNYEUTJQzUlnMga jLRrT4LfY5LHhg8j9MPjSRt+J4+1HFMz0RIZsTaTCgTzuAYtlP9ub+lXAu7g7T/3p9bR +tO7hf12gppXsp5BUsVROMdygPB/Vj4eg++sNZkmqL3UfoYUfP/7yc6LdW14GgzjxWRc 5ap1KnxxR30tUlel8ir4OgTupwWv0JXh9a6x684u7jsDMr25RvHWPeeQCM4J6xn/BOcn YeXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746542406; x=1747147206; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=eXL4/W2KCy0v23MfOskz73x1LQjRcBzqdAtJsMYaNnI=; b=YFaIOq38RpJWEqBptt66/HV3XNi+5et8V3ksUiMmhOwgsVx4+90lwYeRFR6bY736lP esKpvHxSr+ejvjmpolgtw9iKdSD4Mca5lKWHLjLr37ae9tH4BRN/qpB/tO0GkzpXD2Zh sYjH6n82uhEUOea7PSz6LOxnvdcp/LrzPbi06K9BF9fmjOX0u9WL/Tn3TJib4h2aPO55 7qYKGAh7wCa8wS6xemggtSM867G3dF9flEcUPDZU51+rzpBX6d/+PibhcTHjYPEajVyK 5/KqqqfmGIgZ+YBlgVKdTG1j2ydWPRI8fj8JTAK2uKW5TzTvq9zYdauIeuTlUP247m0T PiFQ== X-Gm-Message-State: AOJu0YzIODOFkIhmzTMc6lQw64+t0jgxfsnTRJSPnyoszV/fE1fLUiJb i7Des4k06iIMDH//dqokmrg+A4NOsw8clu27IcCOMpyDrDAspbIEUo910af6W2AWRkfgBGeYYmJ i X-Gm-Gg: ASbGncuFqNMPYQnYlTa3RiPNRqaaopzTaaAJqnxtwpS0rpfnH265wH2zBpeI1LQ0gs5 h3rLqMLeRy8SCBtnMeq29G8FqzPwoAUHyU4ba2eKYpENotypOneaGObRTo18D4DjhvPEarZF+44 rx6W6oHxv2RBEgxcHVYhlpVXo+soUTbEI5YCi54qhx7LNBYDwARQlVEiQDOoat8Cm3+aHtcuFJ4 T7vwOCp+2zfuL7WRtvqYlnoFpyPRP+oeYfVvg8PbO42ROCVIxxaE6Sh5RADlnI/5DLHMBk9rKm4 QHSqs3AOjnbJLxoRA5PyjEgvEDMVGCPX0lAOYbAV7/WNC2Qs7mFgso3+HJ7PfUCud+toKddJ7Aa sQPXmIZksFHKmtQugp7TB X-Received: by 2002:a05:6000:2408:b0:38d:de45:bf98 with SMTP id ffacd0b85a97d-3a0ac0c9abcmr2529900f8f.8.1746542406262; Tue, 06 May 2025 07:40:06 -0700 (PDT) Received: from localhost.localdomain (91-163-26-170.subs.proxad.net. [91.163.26.170]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a0ae17d5e9sm2251022f8f.16.2025.05.06.07.40.04 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 06 May 2025 07:40:05 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Yanan Wang , Paolo Bonzini , Eduardo Habkost , Fam Zheng , Hanna Reitz , Zhao Liu , qemu-block@nongnu.org, Dmitry Fleytman , Richard Henderson , Laurent Vivier , John Snow , Jason Wang , Marcel Apfelbaum , "Michael S. Tsirkin" , Gerd Hoffmann , Fabiano Rosas , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= Subject: [PATCH v3 12/19] hw/core/machine: Remove hw_compat_2_5[] array Date: Tue, 6 May 2025 16:38:58 +0200 Message-ID: <20250506143905.4961-13-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250506143905.4961-1-philmd@linaro.org> References: <20250506143905.4961-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 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é --- include/hw/boards.h | 3 --- hw/core/machine.c | 9 --------- 2 files changed, 12 deletions(-) diff --git a/include/hw/boards.h b/include/hw/boards.h index 5dc5e3b547d..5f1a0fb7e28 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -844,7 +844,4 @@ extern const size_t hw_compat_2_7_len; extern GlobalProperty hw_compat_2_6[]; extern const size_t hw_compat_2_6_len; -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 Tue May 6 14:38:59 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: 887798 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp2586451wrq; Tue, 6 May 2025 07:44:23 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXGucisZfYSZj2rVBg3s/3G3cfhzC/gLr9djOl2EkQfa9dmNdiNiO1TKFTBiLMh1platIJKmQ==@linaro.org X-Google-Smtp-Source: AGHT+IEgceRyfjszAkSo/CrhEqzLG8ecMJrO27Hx1Bz/s5V1ZUTD4bijdTZi82dMGo27HOh/aH9y X-Received: by 2002:a05:6214:f21:b0:6e8:f4c6:681a with SMTP id 6a1803df08f44-6f5358979f7mr52807386d6.12.1746542663474; Tue, 06 May 2025 07:44:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746542663; cv=none; d=google.com; s=arc-20240605; b=CuMq4x5SIng/Y2yEwGraE9Hq5RMhryj9IFvbnlO6HCUKVl2r4HFHjQJGBejXz6SSc1 1v3svLisNbW2mL3k+YH8dKJOcVweer21RGLzq97r1GZMl2tk0vE30shLOaD0m0GLGaL5 yVs2GcaI/Go9/sew87205s4pF9SqolFzCubu0Ii9tGZJDKQU9hqco0Ax31RBiFJsJEC5 arF3+GpR8+zPPNURxkUourhZ9VAGEa8lF0di4hiizPPsLipkNmIb8wAWS/Df8DI9rOZA 18ahi5+VD/ks0ZjEV8nT5EJ5nqpGEePLeyYFyi/IX75UUSah3AnHG4+U518q7BjZ1g0S TxfA== 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=gjm2NV3MsVuXzERs7qPetKCBg7pCwU7Ow/3BPmE8MOo=; fh=XSpotKJkk0QjO1VgmGgsyK7nnDHNLw4NWZrdrHYPOSw=; b=Xp845G4q6cy2U5x4Td2FJ2WtDVQ6AieTfYsL1/WQkGs/ctZBFiAXsJncKOXS4UfFzO /CJajUMS98I7pOZuDZUF65EVnobRt29TQN+LCZRrcXyag2x2i0qG3aqB3Wta1pRQjCj+ sbWOMqb89qMrx322cWQG4hkp4LmDNRCRS6DYQHRzve9R287BiLMS+u8bf/oEiRGVgmA3 VwtLY7eP/Am0vg3byvlVCA49R6FEU3S01CoIrGRg9pjgQfsfD+KpvMMyzGTFXaJxedgv rJ8nuWWiqTsy2sW4jZsHXND57I7WwIz9PKJLaAEqtDs7rsOhoTJeMSvZh0UAZ5pRD7da 5ttg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Xjk62Jlp; 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-6f50f490a3dsi109448786d6.290.2025.05.06.07.44.23 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 May 2025 07:44:23 -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=Xjk62Jlp; 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 1uCJWG-00055y-Ui; Tue, 06 May 2025 10:43:41 -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 1uCJSz-0007xX-C8 for qemu-devel@nongnu.org; Tue, 06 May 2025 10:40:22 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uCJSw-0001oy-5A for qemu-devel@nongnu.org; Tue, 06 May 2025 10:40:16 -0400 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-43cfba466b2so48944035e9.3 for ; Tue, 06 May 2025 07:40:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746542412; x=1747147212; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=gjm2NV3MsVuXzERs7qPetKCBg7pCwU7Ow/3BPmE8MOo=; b=Xjk62Jlp3DqNNz9afNzwHvDaDwml0+amNkLC3zIG4jWdlEC4xNIKOurZ5vlgdCUkgf mMSWARf8az2VDI41p0Kw9ltonkIOlst/SjTCjHnLtWSdiAMZ0A/6JpgsSTKzEYB5D5Fu u5asibyvdd9xVCYKzcQ8MbUQDprXMtn6z+K9muBspyuaO6OviRYbh0pL+9XbTNPKwNP/ yNsR3Pv7piMJYHFnM+dgfJLumTcrNqQePvJOTwTGGmqSkS1DGAh2/doeNL+ylA1Ht78R HxE2g6FO6xTLkKi78HLH73UIhTUhA+937lbc4MHGU3idliIEIpHEasq1LeLn3e6IdvRO 3APw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746542412; x=1747147212; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gjm2NV3MsVuXzERs7qPetKCBg7pCwU7Ow/3BPmE8MOo=; b=Pu+0X+7b6qj2bxiaQEwaFB/60qm4xbsiKxfulTX+2FlHGpm39Vrbg3SJU2QPeeqHIS oSxrNyRjKw6n6pcFP5KnYZ17Gbh9v9klNiakTfKBj6L7NB0kbmU6t2jQpDy1DIDlLo6u jmirXprlxPoqPvliijHVLdbya+VEcUFRZIwLHaxgak3dZPHAMJpynq9YAxc0VPYaEACt V6yimrGJpLGhL3JqSfqW5S1Mb7l7CUnFLDzlfTtNIkHEQ/wQiOXghgT2hdNX6v936vBl ySCO16RNSiPCSOw3zbohtWA6vJDMiFxz8yJgQZY7ZDX5OmUv4e9Uq7WUixSd+qe7LsJI D6aA== X-Gm-Message-State: AOJu0YwI0XwjVLKW2YrAmCDpSnHDcMN9R3YulZ/38AZyDspXeqFzoxeo e1ywCjCYBmserNX4KKsekN6JClDE9blEU9uWm8DSoBet9p7hlEtJ643/tkbH54Xi0y8cde0DDPx W X-Gm-Gg: ASbGnctvAuKkDU0mipHyUG7czgjXSrbiWcufmmx1Vx7h9j5piz7vrTHrkcVllmXK2aF Y6WudbOIZxlBaSr5yGYK9jYcfhHUyGXFoKpfJzaPw9cbAEDi8O8obKPk4m3dBKFLP/k55fnU00R djK+K6LwJjt9irWTzrl+SjFH8kFmXdH4e7Kk/v2ZVthFGmzvafT4ZWn9uWljsUGAI+Hf/qL6QlZ Go0OTLocVi6a59kYW11S/KaTvu4Lyqnc6yYUmkATf+V5v0LnSp1h1foaMEjE79Iv8cXrADBNzZH 8LDr45VGuWjXFqSKzkGVtoViP9ODHmXrdMX2qLqe7TBSsCPh/jIJ4e1qvuCEIMo2X6UVZ+AKcC9 qKPXaHz8qUZSeLvdcprbf X-Received: by 2002:a05:600c:35cb:b0:43c:e481:3353 with SMTP id 5b1f17b1804b1-441d0524b5bmr36344135e9.17.1746542412050; Tue, 06 May 2025 07:40:12 -0700 (PDT) Received: from localhost.localdomain (91-163-26-170.subs.proxad.net. [91.163.26.170]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-441d2f28628sm4871995e9.3.2025.05.06.07.40.10 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 06 May 2025 07:40:11 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Yanan Wang , Paolo Bonzini , Eduardo Habkost , Fam Zheng , Hanna Reitz , Zhao Liu , qemu-block@nongnu.org, Dmitry Fleytman , Richard Henderson , Laurent Vivier , John Snow , Jason Wang , Marcel Apfelbaum , "Michael S. Tsirkin" , Gerd Hoffmann , Fabiano Rosas , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= Subject: [PATCH v3 13/19] hw/block/fdc-isa: Remove 'fallback' property Date: Tue, 6 May 2025 16:38:59 +0200 Message-ID: <20250506143905.4961-14-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250506143905.4961-1-philmd@linaro.org> References: <20250506143905.4961-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=philmd@linaro.org; helo=mail-wm1-x32a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+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é --- hw/block/fdc-isa.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/hw/block/fdc-isa.c b/hw/block/fdc-isa.c index 6d1790e0e61..090b91361cd 100644 --- a/hw/block/fdc-isa.c +++ b/hw/block/fdc-isa.c @@ -112,6 +112,7 @@ static void isabus_fdc_realize(DeviceState *dev, Error **errp) } qdev_set_legacy_instance_id(dev, isa->iobase, 2); + qdev_prop_set_enum(dev, "fallback", FLOPPY_DRIVE_TYPE_288); fdctrl_realize_common(dev, fdctrl, &err); if (err != NULL) { @@ -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 Tue May 6 14:39:00 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: 887796 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp2586236wrq; Tue, 6 May 2025 07:43:58 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWPo+bLqu30dhpuBcAnV1qyYjqBzOvfzZYbuQcKQN3iJGfaCzhbX11PBmjmIiMGL1wmF29tgw==@linaro.org X-Google-Smtp-Source: AGHT+IFrWN/EeRBLtG57jYjYxvo4XdEdgshxHIddyGayB7kNr8O3Bpihj7GXc8vHXfr+2y9iO7GK X-Received: by 2002:ac8:5ac2:0:b0:48b:512a:a919 with SMTP id d75a77b69052e-48dff2e4097mr160741121cf.3.1746542637818; Tue, 06 May 2025 07:43:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746542637; cv=none; d=google.com; s=arc-20240605; b=bjUqCqdH5OYOWg2tdYs7YUV3cCNlbxHqKZA4LWunn298ARdpwke4xe1qIxB5KtCuLi EDVJmkjjo2km+I1dIKGharCRYYT0TyFB/MYk76RMldN+jN6O2+/wu/ErX43egpm3CNeq eJJJNAt/ijoH2qHiMdPHhIw/fRV3RBYr+tiim2fIEHPLnGHhOVHQyd0OGLtz0eZ2B/Oz uGnAFJfVtS3uHrZJSVxegIb2B40KyggMb1uS46wGpfQXCorM+KYfAWKhJJ5Jtjvr7EHk z1iAKugjqabj3PJQSmUrWvIkd8/judqOXewRkAP0Awg0xOFbDPttqctdFXlyXEDPYcpH RIHA== 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=MjppJwO3PoPneuGtrvBsUFRU7aSrgebY1jdyuvD/TSQ=; fh=yv/UmZ//SMR7OMCPM+hEQ1cdGiNsmlJhsS8KuguVnUs=; b=f0XCM+d0roSrh6SjzjW/pfr7EfgWUdmXoNk2UcIXddAdM64i28h8E+Nc9/nhsBtLgx 4jxsqhzRnGXc09N7OJa+TDbq+zvDTa74VeA1tveZgL9Fnxft9Fc6NOJl8Dpem+KpwFPl eUfXYNUEspcQKcBVETrUNCSKeqBwk9551dYbQ+w/qpZIvZiEdvBg9joTEvTiraEQkq93 OBDJ5TKpACNRtJkOUzaNglKZbHw7DsG+CV2boOVZ+kLikrkYeHixdceg24tpu4Io2RhX 8q+iN2VcssLlEhp/2+VTM89LMu2jPmWSiluirsFrkAvwXeK8NDvRtr7imrypkY8G2prh 0ihw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=QvnUsUCF; 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-48b98d13314si112889061cf.564.2025.05.06.07.43.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 May 2025 07:43:57 -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=QvnUsUCF; 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 1uCJVz-0003fi-6U; Tue, 06 May 2025 10:43:23 -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 1uCJT3-0007yG-1u for qemu-devel@nongnu.org; Tue, 06 May 2025 10:40:25 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uCJT1-0001pZ-15 for qemu-devel@nongnu.org; Tue, 06 May 2025 10:40:20 -0400 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-43cf848528aso43093275e9.2 for ; Tue, 06 May 2025 07:40:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746542417; x=1747147217; 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=MjppJwO3PoPneuGtrvBsUFRU7aSrgebY1jdyuvD/TSQ=; b=QvnUsUCFJB+HrKDHRFIZdiQo7IZWyK7Jh0orFIjxnlutMSa/R5bi7tCWlBGtrGLA/o i3vkMWdEfEsTJ61IDzGNhhfddvHHxEwCTT8Td817klCdfrZ+TAlYFOnRSSselCb4vSOI 3eDOv3kOvlU8ZU97W9Hyl189fCJ8PpwTnCnvk1YVb+XkaZM53dKpSxKQsZcScwkdY8QS VjL2K9ULueLw3FZucTlDhpedcnK/ot5f6043crH+YlnRi+EGf1/zaaqdVL2GPGF/+MV/ xz966IY8ufnrNTubJBq2x/DR9SkM+l+DTWgA3DmZeL42eFX9fWxVRYsvOT9+JNHJqqvB M/7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746542417; x=1747147217; 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=MjppJwO3PoPneuGtrvBsUFRU7aSrgebY1jdyuvD/TSQ=; b=MaOszceIU15NmoPoH5WmLNwsbOL3AMiySVzzaLN0btKJX08QcObjCt2wLYYPl5yKRQ MFHQt2yLVJjgjlBA0rmHYWdxU1veuy7awYCG/5EBu9dY4Y1nPP0QMAUfVZ13tlO/w1CT QMacHNtyboggCdu+LA6ToN3fO/u/AXsohcs+zIz45h2y6fx2nNdgiLCz9XYvn/ILt6tm /JMGmAkb/v6Vc6zlNj1lsh8EWJUKaceboN2YzKdtghBLqtktYGD8bPdMsOhLyc/Dpw4b 4GZoRHSbfb7ZVf5Ml0v9kRVHS2YCIYV77zx8VW3A0Gyn4YCWUElvTtsixYaWZ+IF0i5n ZlZw== X-Gm-Message-State: AOJu0Yz7hoHBNVKWheDZrSlS0BrHZF7IAMbzzw+zQTVfPlTRyNEyFIuj nauhGpki7n6VWqViVZ+IE8q/nG2v669gFJRKOlQku9wSrdp4qlSb7BmRWCRgzS8FPFuL9Qc9i8d q X-Gm-Gg: ASbGnctO/zQww9QXoPhdFQTPwm4BkDPZP7wqP6v5dMJ/1dUq0dC0Ke2GJwXtlxpw9Dx kHguMCEeSrhNlOkroobdm6fQqZAmBWxzK7Gxre1ebXeGlT6GjgrN+k23mvtiCmwZ8eS5elVeuaF LaEu3PObmBFph1+nQ1vljWZDihygroPBKuJoKBUi5KlRd44uh3X6LAbg5HKSsfHqhUeoWUtHmk5 UXm45T6c+c6onHv8iruTkBBikguJK05bGaUscM7GQajGBLGFNiiwjG6UJrpGnUl1oPnQCYcA1nS ovKP5i8Yb6vLqf9sdd1hM/qx5Q8mfswf3MzPnptSkutJPDIpBOacXE2fEYp8s9lR2ip5cBYnv7b rabaQp236BtuT/7DPbeYe X-Received: by 2002:a05:6000:40ce:b0:3a0:a3f3:5034 with SMTP id ffacd0b85a97d-3a0ac0ecdeemr2882530f8f.34.1746542416925; Tue, 06 May 2025 07:40:16 -0700 (PDT) Received: from localhost.localdomain (91-163-26-170.subs.proxad.net. [91.163.26.170]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a099b16f9dsm14156691f8f.93.2025.05.06.07.40.15 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 06 May 2025 07:40:16 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Yanan Wang , Paolo Bonzini , Eduardo Habkost , Fam Zheng , Hanna Reitz , Zhao Liu , qemu-block@nongnu.org, Dmitry Fleytman , Richard Henderson , Laurent Vivier , John Snow , Jason Wang , Marcel Apfelbaum , "Michael S. Tsirkin" , Gerd Hoffmann , Fabiano Rosas , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Thomas Huth Subject: [PATCH v3 14/19] hw/scsi/vmw_pvscsi: Remove PVSCSI_COMPAT_OLD_PCI_CONFIGURATION definition Date: Tue, 6 May 2025 16:39:00 +0200 Message-ID: <20250506143905.4961-15-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250506143905.4961-1-philmd@linaro.org> References: <20250506143905.4961-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=philmd@linaro.org; helo=mail-wm1-x329.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+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 --- 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 Tue May 6 14:39:01 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: 887832 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp2589561wrq; Tue, 6 May 2025 07:51:06 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVdmL1BEAZqdy7MtsewOHJFmFsHcrc8wzwLzAHzfFSuIvMScb1jX5rWBtrTgRwcOniIiODKBw==@linaro.org X-Google-Smtp-Source: AGHT+IEEdzL6WSu9Wn/7clUdxXzarfpI+bl7vXr7YRY9iEDtoiB4umpx4pvZ8p+0hqWpqrQhv0Nz X-Received: by 2002:a05:620a:25c:b0:7c5:e40b:caaf with SMTP id af79cd13be357-7caf094c237mr456261385a.31.1746543066318; Tue, 06 May 2025 07:51:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746543066; cv=none; d=google.com; s=arc-20240605; b=KACvzsI+sSd/xuw8lnYjkwkg2dgchVn7JogE0uOepa/ARzEC1wWnXWaEmQ5RgqIHvj i5kfhw+X0Y5tzVTtX6fuysLCqVpHz8uTX/AIO2dIpjriR2nRU37cdhQLlLkwaJL3Hk49 mKtQNicYKqLxb0zr3TzKLTv4N1r4TQV6NXCPYwQXo0I4i/c9hnop8evEx4GCV94yz9AZ k26tJpKthvYLp2xqvnvEQPalrC/oA7u7dBW8ecj3ek0BNj+FeX5a4mYQeSQINtxsKNRt gUgK87OCp5krIW5Ty/gJPt2jpkjfQIcogSdQhnb4tSSL03HTnCsh7N9CJLAXbGRGipbr kigA== 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=NeAsbqePxiywrZL8I2fb4NnneFfbsTioEZQtZ2IfobE=; fh=yv/UmZ//SMR7OMCPM+hEQ1cdGiNsmlJhsS8KuguVnUs=; b=UcgDmiAbWMzy0Efb0hV8hwMcXJONUCaQONLGvopRNaYbX3jx2xDxU5KT526mz/TI+a ark2YzWPMawrScRV6KWwFc2piQN63l1PGN7ALeXeeGfyoCeOZfcuZc+boZHeO/Ewiarn IiDHXdkwqgj3P2VIaaws0gvkBVjxdvegGUjb0I9wfJA0ZgYsKjsTsBzF8Aj+jZrD3nRR i5pBxDyIyiJOvX5VOXz2BUcsviWnL2WqOMOTP/kUR9UlF5NIbvjUUfI2w1nP32Te7zxo urEz4GKuOAbwoNXL3Ix6d/QM297j/76LD0N6qzvhgkxJAbFIs2n97w8KLgnA45gk9nxX 7s/w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=yMD5433g; 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-7cad23ba9b0si1219653985a.91.2025.05.06.07.51.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 May 2025 07:51:06 -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=yMD5433g; 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 1uCJWT-00065v-U0; Tue, 06 May 2025 10:43:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uCJT7-00081C-NR for qemu-devel@nongnu.org; Tue, 06 May 2025 10:40:30 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uCJT6-0001q4-0a for qemu-devel@nongnu.org; Tue, 06 May 2025 10:40:25 -0400 Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-39c1efbefc6so4294005f8f.1 for ; Tue, 06 May 2025 07:40:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746542422; x=1747147222; 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=NeAsbqePxiywrZL8I2fb4NnneFfbsTioEZQtZ2IfobE=; b=yMD5433gysByjVKfogYhws5fOFLg3vMfE1Ruv9ejKeLFwG+wPRx24xZAmcL/scY2hN BWB22s5yDiLj1kx5lAI/wq5QZqLhKMK+GrBKMKHYaEuF5HgvH1BVU06isjpFMj97jzrr 7kBnibPx8i94PmqYFlvQGA1oxqJa26ZpWiDsLfEATorlEq/LuRL3YhHD8Y95czp3Uttm PsLtQu6LnRlR6ddZWX23yj2iY6fy+I6NJiSmr6jvf9BlgORk1hNaYskfVo7jDRG8b8X8 8P9MKjeqMnX4vBdcX+j8+hY+8p5IuNC7JrdODuyt+HlHKHeJKBd9xI3HqNMnmmOy77SZ Ij6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746542422; x=1747147222; 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=NeAsbqePxiywrZL8I2fb4NnneFfbsTioEZQtZ2IfobE=; b=GXBwG0Xn6tNuM08yisD1XCWq+/QcASMtnio3QlPbMYs5sFfSNkrgSUfJfeJMzcEvJo WcxnpL6wuSIeAjtGU0dcEian2+cioCsH4p+ycEJuwA+CVR5Sq3jWnC2DQZIc4B/XaHVh QIwnOTSdktN0adeJrD/vsz3ZyKXQChqou95QCIjuWPrJnjLeF3BGQm81CmT/psuT9EQk 3vtHgZ+Waztu2a5OgrvlVU2iFf9ux+hVvsS/qFVyqTuEXbRDSS2FgYoue2xlYysByyJc GBLGWj0FHO5FtjRpVmPEjkyyeyIZYkaJwXQCoV5ZrKE/G2XGz4TR94/GtwnELPQYwwr8 3Yxg== X-Gm-Message-State: AOJu0Yyr3WkjKIKAu2VOKNq0ouTZvDO3R5N+y+xkcnATy+WBis3Jz3uS ZQr3C8bDGcLogI+HHAyTTWNZ9y2Yk65I9/icZmy4EHlxuqujpwQVEamEy9l4gcOk3S+jt5yfBN7 r X-Gm-Gg: ASbGnct3bbXhok5nNza2LbJTv1he+gw5AcVKDj9VxNYwWXgocgMcpippZ4Hw85wrMOV 5Yd2Q0E5ydbt7mo9SMs1PZOLU1DTX2NmfeNoSvQUUr/341Qk8mKBj0tqWV4OpMJ8pMxHY0maFHI PFaJf7IO+4PhBxLLP3JGwXFQmYPdalRIfeK1e9eUZRK4Givc1yylI3C7Iu4dY5EUNQkyL5MiYTj R/c8FykH866gVZoGJbBQK/m8Q6qZNT6OpA+blJlw01+F7lusDmoJWql4LxqViSkCiyRhyEts9NN QvyiaDCtLgyyu8QNxDLBSoEy9bmquEfUYlKejXd11FAraActCGE3P6jpwAf40xOSugR/ZAazTrG Vpa5WkBIvqQXqKzWwc41m X-Received: by 2002:adf:f1d1:0:b0:3a0:ad55:ca0c with SMTP id ffacd0b85a97d-3a0ad55cb14mr2258955f8f.1.1746542422140; Tue, 06 May 2025 07:40:22 -0700 (PDT) Received: from localhost.localdomain (91-163-26-170.subs.proxad.net. [91.163.26.170]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a099ae35fcsm14158475f8f.32.2025.05.06.07.40.20 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 06 May 2025 07:40:21 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Yanan Wang , Paolo Bonzini , Eduardo Habkost , Fam Zheng , Hanna Reitz , Zhao Liu , qemu-block@nongnu.org, Dmitry Fleytman , Richard Henderson , Laurent Vivier , John Snow , Jason Wang , Marcel Apfelbaum , "Michael S. Tsirkin" , Gerd Hoffmann , Fabiano Rosas , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Thomas Huth Subject: [PATCH v3 15/19] hw/scsi/vmw_pvscsi: Remove PVSCSI_COMPAT_DISABLE_PCIE_BIT definition Date: Tue, 6 May 2025 16:39:01 +0200 Message-ID: <20250506143905.4961-16-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250506143905.4961-1-philmd@linaro.org> References: <20250506143905.4961-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=philmd@linaro.org; helo=mail-wr1-x435.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+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 --- 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 Tue May 6 14:39:02 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: 887797 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp2586248wrq; Tue, 6 May 2025 07:43:59 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUl8B/6ahM8h/N96BZST0VOhVE4cuV6yAlI2eeiKEShmwoih2zNXxeVFsPjRRGWM0BcwnoIQQ==@linaro.org X-Google-Smtp-Source: AGHT+IGDRtPBtn8P5bD49AzACgXOXG7DcHoOvImQeFTrlX3qLQX8RKe+XlRq3wvzrdZnPfW9tFlR X-Received: by 2002:a05:6122:17a4:b0:523:eb47:2884 with SMTP id 71dfb90a1353d-52c367181e0mr37166e0c.6.1746542639726; Tue, 06 May 2025 07:43:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746542639; cv=none; d=google.com; s=arc-20240605; b=fUv2inUDM3NXXcUp5KBFr1auE1wnorVlBDc6GrygehHsgsrw8Rbxtsz1wW+faHEOok ZyZz1XfMEMe5X79+/tgJ2HYH5VrdlN22m2M7W8Dh5T0klO3GtQ4N4MDR0C9w7rj1vE/p qtr9IBwjuHjhjmotiNcaV+oy5VR0IHGNX9XHmIRDK45KnyNt/6pFQbE6GLNQ2ODUQuMt Wxl8ZURFCweUEFOjAEjpX4/Yn1n+sZONTa4XMa4e5ovNAc1br7e9tlZy1MtFDNoB4mCB vvPYt5U/O8ofAoqUaFp62WzSR6sYjh1lUq1vhN/AZuTQZzVF4sZq58W4Sybx0yUQkCnW FTiw== 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=j41fV/T5fVwdY4VDR58WCPqJo5aDoWrBkyOMJ4Dwydk=; fh=XSpotKJkk0QjO1VgmGgsyK7nnDHNLw4NWZrdrHYPOSw=; b=CrF0GJGtswNpjraPc5WYB/5GuIw/TUGcjj94tH6ulm6hN/20AotDKVnAyW2pboe4m8 OutITZ1VXZw7DqeQKkSdiF7pPTyDgHtdxXEy9jYgRHg47Rzs1ijgh8Xf6Ck6SVoTCgtr +Q/gkvhpMpR20VMyBpz+Dn+08W45+26HOD2nmrUMZoW88Yh1IowlLVuzbFWQ3wJSDqwf bvUewW9gjahmYefhF6TYRdBwdQ+CS5ZoQaN9Wo4n5eXG9+vBqwEokNsPuOAdxUwXdq8E tMteiMjCAVQIwVVv5Fsh4kousDnTrYv70gEJQRpsmmFMLYULI6PaY8RvdKWWjLIckNDk 99BA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=wmpFEQUR; 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 71dfb90a1353d-52ae400298bsi2884253e0c.47.2025.05.06.07.43.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 May 2025 07:43:59 -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=wmpFEQUR; 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 1uCJW4-0004Ai-EU; Tue, 06 May 2025 10:43:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uCJTD-000885-8T for qemu-devel@nongnu.org; Tue, 06 May 2025 10:40:36 -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 1uCJTA-0001qU-Tf for qemu-devel@nongnu.org; Tue, 06 May 2025 10:40:30 -0400 Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-39129fc51f8so3822244f8f.0 for ; Tue, 06 May 2025 07:40:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746542427; x=1747147227; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=j41fV/T5fVwdY4VDR58WCPqJo5aDoWrBkyOMJ4Dwydk=; b=wmpFEQURYW9fcrJGc4PuDjVX/XM/MlmA1avmYzmTiJ6wfdpWe/JhZNIEYnsilVGfkl vNoqBy/wFZzSNQty+iJBLXmyhOdwFWxHccICPqlHCHbv6cAKj6TTNgojf1VkbS4WVQA7 PbEC8/IM+hclckm1UIgEPw2SwOU468C9a7d1hpo7SLmZkxhFY6f94AfChdhJXQWRTJnX vx7MW980FmO9KM/pNh05dVpuRTLQk7BBGQdteo1OsomVg8/SkBZJ/RAEdUQ8bCY3L4JN PiZN1EUdrJf98ydQyBQi2knqbPvuteD0qpaptfK8k/1PSdA/LZn+9GBUUrsnKPRFZ3iO 8ayw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746542427; x=1747147227; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=j41fV/T5fVwdY4VDR58WCPqJo5aDoWrBkyOMJ4Dwydk=; b=Af+VYYGafEZGxmLqIsjR7SmvnMuwpMYh1Np70+EySOmTvAvMzFpOBeN3J1DWgGPUHz 5WtQ733ovWF2rXkF1j6ubGuMbFrhhYID2kXBLMek63Jg2YUzXS4plkKuu+7EiZgxrb9e JDJQlsnT5ABwqVYzBdg5IAyHyUCwr1klRFaBmb+KyKG7OsGwe9Quk+cqFqkboEoBlSJ+ S1hNwREHo0rOaCquJJuVooDqWicP50xIm3bsVcLwpI0JfJmS+7DJnjQ9hNX0pAWAcFVV wIo0HHoejK4Pbjuz001BUfZJPRqt5BzmYT9TD3imugcuKKnTEVuao8U3uvhnNedMtawp M6Ow== X-Gm-Message-State: AOJu0YypirPAtlK1NpbEbkVP5dmC1yNzS7fQ0Y/8TVucwzk+eoY1mwND 2/Y6e5VzQYweMpWQYLn34axla4IjmrEti++7xIoAWEBwPlXUFP1K3FK3cTmTM5i6DFpoUjnSZoU 8 X-Gm-Gg: ASbGncumSrGkVgHeCVn1nYCAObS8mGBigfs3/nEkaG+kSI9HTKef2tYjk4NXX+VU9Kq UbOadsXst6R9+cIcywiPNUppjhJIuEJRm4umFoOLBaLbwSWbZuATp5o//H4A9xtCn3Ajr7ktvy9 NIcC8WDUQA5Ljiqe1ou/hL7N+4blz/EjLtL8KyKsN05j+sPeMcSTx5IsVHJ6LGHK300seqY1RKz cuP0XLNREo0LWc6HN3S7GryhO1XE3mz/SbFRyAD4aSROqeFn3vUqtTbXuCbklL+t6jNPhT7x0GT 59RceZhLJo9lupmgWLRI23dglcszv3rWPxNtQPezqWVFmaavx0MCAMjaNCcy09gvvRkJcYgvymz DRZOk+R0M8KsITkiBEOID X-Received: by 2002:a5d:64e8:0:b0:3a0:83a2:1e79 with SMTP id ffacd0b85a97d-3a09fd79f80mr10257819f8f.11.1746542426955; Tue, 06 May 2025 07:40:26 -0700 (PDT) Received: from localhost.localdomain (91-163-26-170.subs.proxad.net. [91.163.26.170]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a099b16f92sm13639579f8f.81.2025.05.06.07.40.25 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 06 May 2025 07:40:26 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Yanan Wang , Paolo Bonzini , Eduardo Habkost , Fam Zheng , Hanna Reitz , Zhao Liu , qemu-block@nongnu.org, Dmitry Fleytman , Richard Henderson , Laurent Vivier , John Snow , Jason Wang , Marcel Apfelbaum , "Michael S. Tsirkin" , Gerd Hoffmann , Fabiano Rosas , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= Subject: [PATCH v3 16/19] hw/scsi/vmw_pvscsi: Convert DeviceRealize -> InstanceInit Date: Tue, 6 May 2025 16:39:02 +0200 Message-ID: <20250506143905.4961-17-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250506143905.4961-1-philmd@linaro.org> References: <20250506143905.4961-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=philmd@linaro.org; helo=mail-wr1-x431.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+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é --- 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 Tue May 6 14:39:03 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: 887804 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp2586672wrq; Tue, 6 May 2025 07:44:52 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUc3pyUGomhfBrLcdu52njoDP9JK6Y2eZnb9+wqwjzt+BhFAjS/DOmfVT3wasdkmR3LUmijCQ==@linaro.org X-Google-Smtp-Source: AGHT+IHWvmng9YclrjNdL2cqDG+5GFa0tgKmfemNSmruVgG/YFFLgvugZc/wcmoVToX6kIUA69ji X-Received: by 2002:ac8:7d8a:0:b0:476:9180:6c27 with SMTP id d75a77b69052e-48dff8e69f4mr210019961cf.13.1746542692506; Tue, 06 May 2025 07:44:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746542692; cv=none; d=google.com; s=arc-20240605; b=gFa1zYRuAvQvutuxzDQ90PHqIka6hapCkKEcusLwbcs8KqFsM4xArfE8cN5OcAckcx /+jx7sPvuNA/aXLcXj5tng4bvEdVGpmUdxSF191bCUlFmJRpvgMuDbeJLWJHLJtJUGjb eeHyqxjh7461a39hgH+DIA2mpFY43G2zWSkjXotv0AhnXaAnAJ/1MRFB18HxL5HHb8MG COnq/t36n4RRZk3EddQvA98liuQIw4KVvzjRitK3SYwzjdOvy0EQLUv6gE+vyeyLRmBX mJOiGjnMt1kS1emYNxbD8FPu06GVfDuV7v89gvCsgH8A3jbO2zPH0N8WOAIlXAeymhRp 7VnQ== 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=+H9UYlRmqVO8yptjvYMIoxPGGH/04VbttZQFCTzfSSI=; fh=XSpotKJkk0QjO1VgmGgsyK7nnDHNLw4NWZrdrHYPOSw=; b=GXQWl2+THYdrow2Ft9UHcbbV1UCqqVBrph1bdg00hp3TMy8iUd/pDr10kzLQujpN1f rZNmuwJ54A1Mo0IIojmY2z48NRgqgzlUMLK0ux3Bs/5/g5B5wFH2KxWyNjZcoPnDF1VJ D35duUHcIgOjk1lkRmYsbc/XPJy40r267e0LABM7w3+krj3g/okzBv6ZiIsWwP0Ra6/r ox4Q20uVi8ZvC9Wh3pXiBoiH2evnbUmIdWOwlsPUO0v/diOLFB2URHZgzleGVjv8x1PL hRYz2li5nRx/e8Jp33xYEasMyi2L/LV0ncT6eClI4WE8HlQJ3JAo71Pgei0V2rQQRh2f jgHA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=QD95Q3K2; 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-48b98247ab6si121221811cf.327.2025.05.06.07.44.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 May 2025 07:44:52 -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=QD95Q3K2; 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 1uCJWb-0006sG-98; Tue, 06 May 2025 10:44:01 -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 1uCJTI-0008DG-C3 for qemu-devel@nongnu.org; Tue, 06 May 2025 10:40:40 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uCJTF-0001rT-Hi for qemu-devel@nongnu.org; Tue, 06 May 2025 10:40:35 -0400 Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-3913d129c1aso3592093f8f.0 for ; Tue, 06 May 2025 07:40:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746542432; x=1747147232; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=+H9UYlRmqVO8yptjvYMIoxPGGH/04VbttZQFCTzfSSI=; b=QD95Q3K25aBwrOqCje3E+BPf+9W7CGje6YPW6owQse39uhEFNnZdShaCdcyI0+jdms 15ZfxyLk5d4rJER5D8UNXcwZw24ff6YxtupMK3LWjEWracdW8t4cSb1hmIRP5XxJblK+ ZKlrg5405kMEiUsJUfyisLKh4PZPohYYclz9fzmv+hdS8c1nwXCExD9RJmSA2rwY0lC0 FfeTO1+HpGkTxT9iLdPObY3jo9tVHsn7gEKP8LpsR/PYEpF/Z5QiXnpR+m5KDgytr53l 6D802h+qaCmT04JiUzVI3qn4hDn9tn8p/ZD9VB3FKAaUK9YXnqom3TM8DDlfX4ylcn0K bJDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746542432; x=1747147232; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+H9UYlRmqVO8yptjvYMIoxPGGH/04VbttZQFCTzfSSI=; b=N5t0UYZCNq/eB62N6KagiBr2XN2nG6MuDkbOXIQjLbCcQcTjpNL7o9MLmUT7xyd03T HVGXMFJI/MT4kQaIPMDnEBkGedg9zDylg+ORhsFsWdJKcaiAV8ts0bQOfeVsf7fYmXX5 C72XvK059x9dMXZbkGdW47glE9Ovd/v4qi92ezIpgIRPV+GnufrVDGobyOOUa4yTcg9t Tqdhs33IKnxKj7nBLe+nRsrWckwR+7KBl6ebuNbzz3U+XgDbOXWQ+bScQKWMcX6avlgD KQ0SUfiZrX3fygqrm9xpJZwle/s8r8C8uU0eJN/b2nXMjXAQ2taiTOICa2y0Jti6E3KB P7RQ== X-Gm-Message-State: AOJu0YxJFesYPBTny/fBXuNP2XeRMrb5IGqpDzR+EhBCk20lIN50FKcA zFjiY1VQiDQN9jePynq0xxm2cHY1jC2oYD/laLijlNg2ytcP0OE2ib+Zh8R3Qe+EogUeh8dfe3t R X-Gm-Gg: ASbGncs+I3LRPRscPG+mDciQlTZd+LajPq/f8rQqnA9+IcDYvieLRcP0Qc3QLnJ/Uqz 9YcK8ZtuqV7JMOIWz0odfK4EY2cL6oc4yVmLFVZ6il/LHr8llVvLV7llbKLOHlt6+ApHoWvmNjF 0I8kNFXLgGXiYwLSxFNruhBcqF56Ma3xZvA11awnYz0cbEZ3zjYLJr3ApmVJuc5sNnewLHwirBK BCQxUGrek6RVLbbyiTGbO4z4Y+lMnuIyP/Zb6j4cQmcNNSOqRNGgKViCEszcfR+ZXAxB+Tjr2fv F0ShOAxw3d+Ty4GGbOA8HccDJvZC6VqxvBvyZ33AQtXEjenTb+cCZ7WrJDCZ53/Em1dpiejmVPM I7lYOrlcrW/bqIR30qRt6 X-Received: by 2002:a05:6000:184f:b0:3a0:9dda:c2e2 with SMTP id ffacd0b85a97d-3a0b43f8fc1mr7077f8f.22.1746542431760; Tue, 06 May 2025 07:40:31 -0700 (PDT) Received: from localhost.localdomain (91-163-26-170.subs.proxad.net. [91.163.26.170]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a099b107c4sm13919157f8f.76.2025.05.06.07.40.30 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 06 May 2025 07:40:31 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Yanan Wang , Paolo Bonzini , Eduardo Habkost , Fam Zheng , Hanna Reitz , Zhao Liu , qemu-block@nongnu.org, Dmitry Fleytman , Richard Henderson , Laurent Vivier , John Snow , Jason Wang , Marcel Apfelbaum , "Michael S. Tsirkin" , Gerd Hoffmann , Fabiano Rosas , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= Subject: [PATCH v3 17/19] hw/net/vmxnet3: Remove VMXNET3_COMPAT_FLAG_OLD_MSI_OFFSETS definition Date: Tue, 6 May 2025 16:39:03 +0200 Message-ID: <20250506143905.4961-18-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250506143905.4961-1-philmd@linaro.org> References: <20250506143905.4961-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=philmd@linaro.org; helo=mail-wr1-x42a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=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_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é --- 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 Tue May 6 14:39:04 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: 887815 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp2588145wrq; Tue, 6 May 2025 07:47:49 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV0l1JvjuH1sQs1d+jFlGFMoC6QKMRi3gpxJ7cvGlKTTeu0beTeKsRAzATZXYejddCyRsiWmw==@linaro.org X-Google-Smtp-Source: AGHT+IF8ZB6tshwAm1Z7wXY73aOOcRd5gMKXOw7rPbjKytx5dglcyuiA5Y9g9gcHdBUTPWRVXbDS X-Received: by 2002:a05:622a:1c0f:b0:476:9dc9:3c2a with SMTP id d75a77b69052e-48e017443ebmr189225821cf.48.1746542869693; Tue, 06 May 2025 07:47:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746542869; cv=none; d=google.com; s=arc-20240605; b=X2dOXeAj0a6ORnXqLEsqpovSZHh+DzTOdbYfJCyHtj7vwwV7Zln3V6isE+iFTvcI9G EPSyCPBRA7zgNQTI+VWFi/mh+I14DDAlYEFAIcuGILf1ldFufDNNf8/NF789CLlUjCO9 QyU/YACvNsBqxTJcZ59KxIE31qYHOD2ic5K3d0fEI4/J4V4xOBiYhcwOvWLZWZIsqEC9 FJJMeXr+cjE2y6+iUa1oNdPJ1vL8Lcq8bRN26d5umBBDP+unlYBuF/oQI6GaIpKrYXbn u/p/Yg5uuod+FIjaiVkXU6xeSmeQcNs9stilwmU/WMX6RuE9lDriwoys6400BmpdxRrE VLtA== 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=Pj+GFYlfc9iJo6yTyQ5Nz9Q5zJ67gCxIABOM4SRTAcA=; fh=XSpotKJkk0QjO1VgmGgsyK7nnDHNLw4NWZrdrHYPOSw=; b=WjqU59MyrJDCNyHQlDgNAYoRi7zxgu2VilqHk3xq92+UsKtTEBXlrHCPHyON9/dy5a K28t8Kv/WEIjBl/+UHCmkAwWD2VQoL89xItpwF9pEWrg39ktAhjTcczCVvdIz/p5YA7r aUUQYRpJW2ulj61mpqE49Bwidg4RwMeXNq0jGSiu3cYimY4/J98E+AKukr788eOTc6uD Z9iBhgi3GvEXvb82PhI8A5Q9bfkoFTmXfS7IT6D5w4/RyJZYkFXKOgSjfEhoItC3A3DN JU5E0P9zPfq0EaqJGjrACYSsFFH0MCtxlVMU4cTvEu3w+7ztAeK3WaQySjcopOTGFN5d Kd/Q==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ASE7gzgb; 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-48b990fd4fbsi119039021cf.663.2025.05.06.07.47.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 May 2025 07:47:49 -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=ASE7gzgb; 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 1uCJWh-0007U7-2S; Tue, 06 May 2025 10:44:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uCJTN-0008Jn-60 for qemu-devel@nongnu.org; Tue, 06 May 2025 10:40:41 -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 1uCJTK-0001sI-MG for qemu-devel@nongnu.org; Tue, 06 May 2025 10:40:40 -0400 Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-39ee57c0b8cso5210678f8f.0 for ; Tue, 06 May 2025 07:40:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746542436; x=1747147236; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Pj+GFYlfc9iJo6yTyQ5Nz9Q5zJ67gCxIABOM4SRTAcA=; b=ASE7gzgbmEQ2b/UX7UfwH4ISLSFVYLCe/zLPUFZsYFaWzRquTO8gMlx6hvfR6AbLxm +BeC6RUVC2ngnc+a+/tQxyz2BT61hOh+JEfPxt6m+cpfZpROBUxf3FUbexRM6gumYsgb i85auihVy0Dg4CTVFjm6Yg5JbT3Q2yW8d3T4rfZx5teuWdxG/JLhEI4njovija2UboG+ lbouhAtYGTe1qNK0tSBqrUsSrMKDV+/dwQFik4BWq/dUR7QqBoOcv2TsQkyitOvyrWLK Ou+roJtHs6dK+hEDuFiVmNDrgx3TXLNNz6783I7DI60JIxDb28aL+2CVtvTVJ5mvkZrk gu4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746542436; x=1747147236; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Pj+GFYlfc9iJo6yTyQ5Nz9Q5zJ67gCxIABOM4SRTAcA=; b=MO1ji6i+sLBv3Z5ytw/Q9hPDOrGm4X7s61D2fVauXwOruERSYts86W0xTlGOEij2qv q/dhAQxmICIkkHHR3WTH1KV5VIfDiwxgJsX0OyCqA1DfeK4s6lQcnAgX1qxeYqEMHWWa 9jlhyqsQ7RSBs/1drSzQk21G8ElCZjE+F5XKjyF6yON94v3+J7bqrm9KqMyguzZRduC5 Plpe93xDVV8C8btT04TP6xSWVRZ1hz2xtXmc1Fhv1MFzCoex68goFcv1P1mUGBvBsZcY DntGVXih7h1d+EJ61rPkNDQvtuZbJu0XWJOn1MnbJP3BBTpmhBYPP5fdLFwfFtnFiMKs vBjA== X-Gm-Message-State: AOJu0Yzlxuf+vgcaBYu3bAK6iGc+FJhHBjtTLBPj2EuBH60qZ++C3n1m EIzlF145ZHQJrInnzYOVs4dRQOmadKAb6SI9e21T8RlRT9Bzip9nxnVZaosnCTxoCGiY93yV4/a B X-Gm-Gg: ASbGncsRuulaVIyK93QBZ9KexgLW/QbM/UFIq46gOlKUhgzZoboKCbB/asV8VCHWD9X qjwEad5sdCweFNzfYt5+c1gcWvFNYiQhRuEN5YN88ZWl2+CcOuS5tLCMnWh+AuiMTG3d6ckXMhO teMJj2LjwlNECg7wTPApb6PGwTAfMCvtuHsH2YkBvwTL4Gxl8mSxFHnRHmUIaZ54xX9Em8d5+k7 L70DYRpi/0Yy5ECTYaQzmyzr0u1WlXufbmloHQTfNraX7CM/53xjrmicVt5WMMC3pWkmdBO0P0K c0kMrGrV6zzkevnWmb/oBl2cglTxmVaY272RruMUzorCNQERkUW0FyEYhCERAN66oSP6V6hEPT4 hXoaaFQe4DyMvBJ8BC8Ac X-Received: by 2002:a05:6000:2204:b0:39c:268e:ae04 with SMTP id ffacd0b85a97d-3a09fd0d09dmr8979686f8f.0.1746542436570; Tue, 06 May 2025 07:40:36 -0700 (PDT) Received: from localhost.localdomain (91-163-26-170.subs.proxad.net. [91.163.26.170]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a0ad661602sm2344414f8f.61.2025.05.06.07.40.35 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 06 May 2025 07:40:36 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Yanan Wang , Paolo Bonzini , Eduardo Habkost , Fam Zheng , Hanna Reitz , Zhao Liu , qemu-block@nongnu.org, Dmitry Fleytman , Richard Henderson , Laurent Vivier , John Snow , Jason Wang , Marcel Apfelbaum , "Michael S. Tsirkin" , Gerd Hoffmann , Fabiano Rosas , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= Subject: [PATCH v3 18/19] hw/net/vmxnet3: Remove VMXNET3_COMPAT_FLAG_DISABLE_PCIE definition Date: Tue, 6 May 2025 16:39:04 +0200 Message-ID: <20250506143905.4961-19-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250506143905.4961-1-philmd@linaro.org> References: <20250506143905.4961-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 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é --- 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 Tue May 6 14:39:05 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: 887826 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp2588802wrq; Tue, 6 May 2025 07:49:24 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVrE1j3H+bHlcKQgJukih0lBIVp4QT0A0tQKpCZa9VN9TPy+fhLYvVAz/FI8l/h74gJlp7lIA==@linaro.org X-Google-Smtp-Source: AGHT+IH4XkkFqBBA9f8Y1i93dB/+dXelwdoPvj32zJKYJLJlOv0bzklGNefZXZ6LFuQDLqTA5jof X-Received: by 2002:a05:622a:1f94:b0:48c:d25d:5f69 with SMTP id d75a77b69052e-491ffe2869dmr1019671cf.3.1746542964056; Tue, 06 May 2025 07:49:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746542964; cv=none; d=google.com; s=arc-20240605; b=i/IDJRZhYP93sdpfAhY+j765Ly7uFZqyDA/FoVSvKKbpdhu5Be5pdbYRnPuHGs4GS+ MM9TUWubKwEBD3+JViHTnhEmp7FiwOEIAgmrai9Q+TogsheowTzL5snbfSkY5xaT4PhC SuxLhEyPPH+b495AXI7Pr15NPyVV/nDyRf7dyVwLrk3w8XZqltyEQXoE1DNOKYXYr6s0 bV8foGZC3+5A5qkTj3RfHU12atYoi3laBt6QylHKXtzFRyYwBc46JpHIr84j2hUG+Dfu bZyIeg0qxoPnp84jg1ysobAWKsYdLPpDY7PC/yLRNG2EUmHzoJBGVy14J53W4CcfY0Dv 1d3A== 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=kg1vT0Z/kKcz1VyaWx5HUe6zicIy/oQzxPnBZl9mXrw=; fh=XSpotKJkk0QjO1VgmGgsyK7nnDHNLw4NWZrdrHYPOSw=; b=jewtUZomTIKSmM0TVcaoKEJwvGwWpQWV7KjQ1OXcmKRGJo+anyCbbzIXRKM7eZupn5 4BEH7vmzb5/QZGHCIzj3WsuBS4AWEf9qgTNdCuwlP0KcvL7DK5PbEJRUvl/KgMLZuf1j CJlHawO71bZn4G5Kgw8W+XFwPaLlDHRyUA6tDXM3+wKn7LhG5N3HznHmaHnkNQF/fHTa D/XN/y/0xZ6ML/YMQNBBu5XQKyc/3fkCW5/sodNSY3f/9evJpm3svBcl5fRMm7zVURlR KNw2GLAsCzh0AkwWOkAOhA818GIXrP2wR9o2Z+n9X4AXTYC77/nvh8FRQKazTjW3pUzT dBdw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=sxDPRMao; 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-48b98733ab2si118294551cf.417.2025.05.06.07.49.23 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 May 2025 07:49: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=sxDPRMao; 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 1uCJXV-0003Yz-7d; Tue, 06 May 2025 10:44: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 1uCJTT-00006S-NQ for qemu-devel@nongnu.org; Tue, 06 May 2025 10:41:17 -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 1uCJTP-0001u1-H2 for qemu-devel@nongnu.org; Tue, 06 May 2025 10:40:47 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-441d1ed82faso5295715e9.0 for ; Tue, 06 May 2025 07:40:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746542441; x=1747147241; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=kg1vT0Z/kKcz1VyaWx5HUe6zicIy/oQzxPnBZl9mXrw=; b=sxDPRMaoadOTKAaJg3X4/AMIpL9xosCQ1kuiPnoqdqbri3yOBJg2QWj0juE/DP93DT x9LRnt6C3g9N+FdKrwV8+NwnuqGbFaVPwB65BiCqVjLUwuIlpqFN6tiYMrZPdqL4aKuX bShYlfW7Uz7KxGrHXA/ptDcGUrr9SCe0wFf5Vx6G0gRPZBIVLPV8ZQ+nJZ5K5603Lixi Zkez9X9IchRyZWGFjmHSDs4cKqRGrtRxXdmyHoeZhoal9w/pi8yWEl+3stKI/F8o/NtJ CaIMa/eXhfi6DnC2bbXnn6e/kAfcmccfq43SWEi/o/zeNNCZbJWmTq9HKX/9NA2FOFoW DTMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746542441; x=1747147241; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kg1vT0Z/kKcz1VyaWx5HUe6zicIy/oQzxPnBZl9mXrw=; b=LFcsKeCdn7e5BsNhM+bWMCfvzE0W5frK2kqlg7W+i9LTH+2wK29djrF3ndT2LTv71Q quMXslDhbxQXlX+2hmGrYdAIqHMAFHXQNd4BumvAQCxQl5b7I1kCLH2snKiJwfca6UTa IFW0+W5MNQT9fr8I99KbSe8+5xjvTEcjnGdbNathKwqI856m/aTcB8+VkPG5TNCctbBO qP7cXp2uylK1oFpQ6uXOql7Cp8xvxAvmnSZTCVbsWA+r8RAkQdkS3jDO2Dvovdsq9UTP CNdiu4bRZ8bh4BpQtM9Sk/DoCKP5tElRmCVJcfGUOQldHK98J48P8nk3V5DiX1P5ZPYg pzkw== X-Gm-Message-State: AOJu0Yyi/orU/ofBzZjFj7DFVgY2XLutlep6oF1i+YOdAfMtrp5NWLHP tKS2rSCAdE3Vx5qa0SRr45WNHM1OjNewvuEkYxkFKVAIqELpsmNZutJYo2uBBqp3m6DpojQKrhF Z X-Gm-Gg: ASbGncsGMpT7NHvoE/rhsPxGF2UN2RM1rEIUabkCj5DKbJDHMZ/4uqo48Ib7V6AK3zY kETIJ5SpwA0LMBt60daA8BEV5vlor3XK2slbAmRSjERddrW9z+Si3H3hrgiE9q+kQMzAURfSjqb t+JfHbrl2nrbhpj/mjAGCW4Kzf5mpaYOmOWYG8oNXZLsmH+eFz1wCHFjHldBb+51DwyvEVEAqaJ yP4S6wmnwjsLcBx3spAIibOoK5aWFxXQzjS9dJgqdvshxpNX5DKyhBca4dcZ7iq7HiLHPdPULzI +Y92OCYJ/cdRzr21+eHbfxU1f0kM/CcPuJIT0/8CzWmkHPCT8FJN4bAOwOPFio0Wnl2DB8js396 XXHK82djVNSWV/wGAoucG X-Received: by 2002:a05:600c:34c7:b0:43c:eeee:b70a with SMTP id 5b1f17b1804b1-441c491fcb6mr89439125e9.22.1746542441449; Tue, 06 May 2025 07:40:41 -0700 (PDT) Received: from localhost.localdomain (91-163-26-170.subs.proxad.net. [91.163.26.170]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-441b2b20a70sm220279655e9.31.2025.05.06.07.40.40 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 06 May 2025 07:40:41 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Yanan Wang , Paolo Bonzini , Eduardo Habkost , Fam Zheng , Hanna Reitz , Zhao Liu , qemu-block@nongnu.org, Dmitry Fleytman , Richard Henderson , Laurent Vivier , John Snow , Jason Wang , Marcel Apfelbaum , "Michael S. Tsirkin" , Gerd Hoffmann , Fabiano Rosas , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= Subject: [PATCH v3 19/19] hw/net/vmxnet3: Merge DeviceRealize in InstanceInit Date: Tue, 6 May 2025 16:39:05 +0200 Message-ID: <20250506143905.4961-20-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250506143905.4961-1-philmd@linaro.org> References: <20250506143905.4961-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=philmd@linaro.org; helo=mail-wm1-x330.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+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é --- 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;