From nobody Sat Apr 11 21:30:07 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1772708008; cv=none; d=zohomail.com; s=zohoarc; b=SLHrbqNyxA/YZBti+QW8aalEgTfw75skCIOixXVTCPUATrkm+rNXQQSq02Ob83bBpOeCb3dKMcAM2cTgFX89NdJHjBYDNzeKlr0sFiDXMrCdIg6DG7dQz6HuWtHUV7gNYCfOnLRSoIcUZEGrzm7vOQ1F3KSz+5BdhJrv/UWbLOg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772708008; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=RSquUaLw4knBApgxR05Gik1zrmTuieDfw2Ti1+usve0=; b=TLuuEpr2XxsCB2Ih7qUiIqg3JSYIUr6UoyCPtf5KbiCemP3RSPGjFTmoYBGFs99TAhdkd/F4cDPjAGfbn8wqowY7tadR5wetBXOdxx/MMbtDqYVT8laPUvY2S6ZxU112Dyn+0nOB6DZQAeI5Ljpxl7HrPmi5bUX70CC0XgMFOGo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772708008355354.86747122825693; Thu, 5 Mar 2026 02:53:28 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vy6Ji-0001FI-BF; Thu, 05 Mar 2026 05:52:30 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vy6Jg-0001F6-Hy for qemu-devel@nongnu.org; Thu, 05 Mar 2026 05:52:28 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vy6Jf-0005Su-6J for qemu-devel@nongnu.org; Thu, 05 Mar 2026 05:52:28 -0500 Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-172-VxmQHNcINuOKqhbqEyIUhg-1; Thu, 05 Mar 2026 05:52:23 -0500 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 664DE180044D; Thu, 5 Mar 2026 10:52:22 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.45.224.75]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 8F7283003E98; Thu, 5 Mar 2026 10:52:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1772707946; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=RSquUaLw4knBApgxR05Gik1zrmTuieDfw2Ti1+usve0=; b=Zo4ZvzvRMA8jHpu2QuoNqNHkz1UkXbC10UpJ5ppebyShHBUBHceRfWfCBXAQtzsHpZ1vn+ 7DwT2I7ToHJRgWBeE03v6/hbyh84Me4GSHQMbl6i+BV/2DRaeBexdtvOtBHV4XSNkJ6m4R jlJPsNEiMkXi3/Pml22diEq/PdPZncw= X-MC-Unique: VxmQHNcINuOKqhbqEyIUhg-1 X-Mimecast-MFC-AGG-ID: VxmQHNcINuOKqhbqEyIUhg_1772707942 From: Thomas Huth To: Peter Maydell Cc: qemu-devel@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Igor Mammedov Subject: [PULL 01/28] hw/i386/pc: Remove deprecated pc-q35-2.8 and pc-i440fx-2.8 machines Date: Thu, 5 Mar 2026 11:51:48 +0100 Message-ID: <20260305105215.302571-2-thuth@redhat.com> In-Reply-To: <20260305105215.302571-1-thuth@redhat.com> References: <20260305105215.302571-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 0 X-Spam_score: -0.0 X-Spam_bar: / X-Spam_report: (-0.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.703, RCVD_IN_VALIDITY_SAFE_BLOCKED=1.386, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1772708010852158500 From: Philippe Mathieu-Daud=C3=A9 These machines has been supported for a period of more than 6 years. According to our versioned machine support policy (see commit ce80c4fa6ff "docs: document special exception for machine type deprecation & removal") they can now be removed. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20250501210456.89071-2-philmd@linaro.org> Reviewed-by: Igor Mammedov Signed-off-by: Thomas Huth Message-ID: <20260225092024.794595-2-thuth@redhat.com> --- hw/i386/pc_piix.c | 9 --------- hw/i386/pc_q35.c | 9 --------- 2 files changed, 18 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index f9e0bca9743..58d76d2d410 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -714,15 +714,6 @@ static void pc_i440fx_machine_2_9_options(MachineClass= *m) =20 DEFINE_I440FX_MACHINE(2, 9); =20 -static void pc_i440fx_machine_2_8_options(MachineClass *m) -{ - pc_i440fx_machine_2_9_options(m); - compat_props_add(m->compat_props, hw_compat_2_8, hw_compat_2_8_len); - compat_props_add(m->compat_props, pc_compat_2_8, pc_compat_2_8_len); -} - -DEFINE_I440FX_MACHINE(2, 8); - #ifdef CONFIG_XEN static void xenfv_machine_4_2_options(MachineClass *m) { diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 9158631f761..7fe6ca64f9d 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -661,12 +661,3 @@ static void pc_q35_machine_2_9_options(MachineClass *m) } =20 DEFINE_Q35_MACHINE(2, 9); - -static void pc_q35_machine_2_8_options(MachineClass *m) -{ - pc_q35_machine_2_9_options(m); - compat_props_add(m->compat_props, hw_compat_2_8, hw_compat_2_8_len); - compat_props_add(m->compat_props, pc_compat_2_8, pc_compat_2_8_len); -} - -DEFINE_Q35_MACHINE(2, 8); --=20 2.53.0 From nobody Sat Apr 11 21:30:07 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1772708013; cv=none; d=zohomail.com; s=zohoarc; b=iGRJe9DFKw6DVmLc4fVGRLSvfDCseN1/q7DIvUuTwMajnXCaPKcplijVMsznvSyPjWdWacm6i8tng+iNQkVLmPi50OQTxug1twqWXnriTJhFK/2BFCb3PPNWfZTiu+AgeIJJt4xThK5pVTWiE5RhtmlAxyynoRhCkfidrHhvp0w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772708013; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=NYg1EuXlgmxwdFtG8SzoD3sUFm7M8YV+vIWnbYEBMLQ=; b=dpOCkwitUTUXI3UtlA3F3MVVv4gRJ2bAv0yelwoEEs3ZHpD7OVyan+0xehPijjg0xeVzop6xMnTYWhAu2eeq3zr6FqSjznWxNJppbBhR1JS4J+UxcW7oaMMOLxf4NpmFg6EyDpODyXfZDWvVeB8AtuZjDQKFjye5J7R6eBJFO2M= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772708013807691.010394288304; Thu, 5 Mar 2026 02:53:33 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vy6Jk-0001Fp-Sn; Thu, 05 Mar 2026 05:52:32 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vy6Jj-0001FX-C0 for qemu-devel@nongnu.org; Thu, 05 Mar 2026 05:52:31 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vy6Ji-0005TH-3G for qemu-devel@nongnu.org; Thu, 05 Mar 2026 05:52:31 -0500 Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-542-fLilHpXRPU2PLDTTCjTjnw-1; Thu, 05 Mar 2026 05:52:26 -0500 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id EB841195609F; Thu, 5 Mar 2026 10:52:24 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.45.224.75]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id DACAC3003E98; Thu, 5 Mar 2026 10:52:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1772707949; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=NYg1EuXlgmxwdFtG8SzoD3sUFm7M8YV+vIWnbYEBMLQ=; b=jKL7xnYsL7SNbfYoXp09/nAPlTGUKNSm+CIOOXqxYI3niT4/Ih9ZwQB7CR39Fwzw1aIlMQ lrZx4NS+zL5RZJgJtu9+JDDppGrxVw0f/9nGLXg1TaJcU/+rNxI5y46ZntM2HQP64LN+Z+ lorRLLFy+ArzVoPypBlUGjl0yXevXCU= X-MC-Unique: fLilHpXRPU2PLDTTCjTjnw-1 X-Mimecast-MFC-AGG-ID: fLilHpXRPU2PLDTTCjTjnw_1772707945 From: Thomas Huth To: Peter Maydell Cc: qemu-devel@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Igor Mammedov Subject: [PULL 02/28] hw/i386/pc: Remove pc_compat_2_8[] array Date: Thu, 5 Mar 2026 11:51:49 +0100 Message-ID: <20260305105215.302571-3-thuth@redhat.com> In-Reply-To: <20260305105215.302571-1-thuth@redhat.com> References: <20260305105215.302571-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 33 X-Spam_score: 3.3 X-Spam_bar: +++ X-Spam_report: (3.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.703, RCVD_IN_VALIDITY_SAFE_BLOCKED=1.386, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1772708014897158500 From: Philippe Mathieu-Daud=C3=A9 The pc_compat_2_8[] array was only used by the pc-q35-2.8 and pc-i440fx-2.8 machines, which got removed. Remove it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20250501210456.89071-3-philmd@linaro.org> Reviewed-by: Igor Mammedov Signed-off-by: Thomas Huth Message-ID: <20260225092024.794595-3-thuth@redhat.com> --- include/hw/i386/pc.h | 3 --- hw/i386/pc.c | 9 --------- 2 files changed, 12 deletions(-) diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 1cf88c16975..d8fe1c3c8e5 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -292,9 +292,6 @@ extern const size_t pc_compat_2_10_len; extern GlobalProperty pc_compat_2_9[]; extern const size_t pc_compat_2_9_len; =20 -extern GlobalProperty pc_compat_2_8[]; -extern const size_t pc_compat_2_8_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 0dd3fd01d98..d36b4917b31 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -247,15 +247,6 @@ GlobalProperty pc_compat_2_9[] =3D { }; const size_t pc_compat_2_9_len =3D G_N_ELEMENTS(pc_compat_2_9); =20 -GlobalProperty pc_compat_2_8[] =3D { - { TYPE_X86_CPU, "tcg-cpuid", "off" }, - { "kvmclock", "x-mach-use-reliable-get-clock", "off" }, - { "ICH9-LPC", "x-smi-broadcast", "off" }, - { TYPE_X86_CPU, "vmware-cpuid-freq", "off" }, - { "Haswell-" TYPE_X86_CPU, "stepping", "1" }, -}; -const size_t pc_compat_2_8_len =3D G_N_ELEMENTS(pc_compat_2_8); - /* * @PC_FW_DATA: * Size of the chunk of memory at the top of RAM for the BIOS ACPI tables --=20 2.53.0 From nobody Sat Apr 11 21:30:07 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1772707970; cv=none; d=zohomail.com; s=zohoarc; b=NQ2UaaVvcl6oeoj2HOqtF9C0Nf0fU+M2LEPWYnRft3IstSbCU3z5wwMM4QCJx26MWPW+Q3bNG1lZ0B0UZ54jzfmB/VZUfWIuPaoV0KKFpgge/JbxTHtwCXaQ9oKuTXwmr1blL/s0wp8wsnxt3yiS5n0D/QAe9yFPy/w2Y1HeL0s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772707970; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=la+BOr95aUp/W7ujdDTh9VuCUIxhvdF/jCyLNUWQAJE=; b=NQHUx96zDp9lvuP93PThSxJELk1x41Y4SqLRZBJGVqDjI4R7p5BWREPq9e3rYq0NQ2Iz1ThCekCbGNfRH4MW3BbGe/ftxCzD8CGknXpoa8yWDbdbtA0U8NxTRi7aWRPhTbAZ8M64uqgJy28UbAvuDthY0VD9EA2GA7/tVNp/MBQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772707970410410.2650055789305; Thu, 5 Mar 2026 02:52:50 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vy6Jn-0001GF-GA; Thu, 05 Mar 2026 05:52:36 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vy6Jm-0001G7-9q for qemu-devel@nongnu.org; Thu, 05 Mar 2026 05:52:34 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vy6Jk-0005Tl-Pq for qemu-devel@nongnu.org; Thu, 05 Mar 2026 05:52:34 -0500 Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-552-zTM_p58OMge8UcQdouwq4w-1; Thu, 05 Mar 2026 05:52:29 -0500 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 059C319560B3; Thu, 5 Mar 2026 10:52:28 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.45.224.75]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id AB4FC3003E98; Thu, 5 Mar 2026 10:52:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1772707952; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=la+BOr95aUp/W7ujdDTh9VuCUIxhvdF/jCyLNUWQAJE=; b=IwpxjdQBLp77SXnU0tAR1GZx04e3/vBrCo/eZu6PDd3mP1pLaGaZx3ZdqRWpzPwHJWsgPF F50PX6zGFLyWIuCN1bTOR6GTrOu0tefTXZb6UiIJ2KaYeoFYWSnq+hSNoEpXqnazxgtTCp ZND83cHVOWqWrqTDi+ZXis9zCAG/IqM= X-MC-Unique: zTM_p58OMge8UcQdouwq4w-1 X-Mimecast-MFC-AGG-ID: zTM_p58OMge8UcQdouwq4w_1772707948 From: Thomas Huth To: Peter Maydell Cc: qemu-devel@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Igor Mammedov Subject: [PULL 03/28] hw/i386/kvm: Remove KVMClockState::mach_use_reliable_get_clock field Date: Thu, 5 Mar 2026 11:51:50 +0100 Message-ID: <20260305105215.302571-4-thuth@redhat.com> In-Reply-To: <20260305105215.302571-1-thuth@redhat.com> References: <20260305105215.302571-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 33 X-Spam_score: 3.3 X-Spam_bar: +++ X-Spam_report: (3.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.703, RCVD_IN_VALIDITY_SAFE_BLOCKED=1.386, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1772707972712158500 From: Philippe Mathieu-Daud=C3=A9 The KVMClockState::mach_use_reliable_get_clock boolean was only used by the pc-q35-2.8 and pc-i440fx-2.8 machines, which got removed. Remove it, along with the 'x-mach-use-reliable-get-clock' property. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20250501210456.89071-5-philmd@linaro.org> Reviewed-by: Igor Mammedov Signed-off-by: Thomas Huth Message-ID: <20260225092024.794595-4-thuth@redhat.com> --- hw/i386/kvm/clock.c | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/hw/i386/kvm/clock.c b/hw/i386/kvm/clock.c index 10d34254f02..7d167c8b006 100644 --- a/hw/i386/kvm/clock.c +++ b/hw/i386/kvm/clock.c @@ -23,7 +23,6 @@ #include "migration/vmstate.h" #include "hw/core/sysbus.h" #include "hw/i386/kvm/clock.h" -#include "hw/core/qdev-properties.h" #include "exec/cpu-common.h" #include "qapi/error.h" =20 @@ -44,9 +43,6 @@ struct KVMClockState { /* whether the 'clock' value was obtained in the 'paused' state */ bool runstate_paused; =20 - /* whether machine type supports reliable KVM_GET_CLOCK */ - bool mach_use_reliable_get_clock; - /* whether the 'clock' value was obtained in a host with * reliable KVM_GET_CLOCK */ bool clock_is_reliable; @@ -292,18 +288,10 @@ static void kvmclock_realize(DeviceState *dev, Error = **errp) kvm_vmfd_add_change_notifier(&s->kvmclock_vmfd_change_notifier); } =20 -static bool kvmclock_clock_is_reliable_needed(void *opaque) -{ - KVMClockState *s =3D opaque; - - return s->mach_use_reliable_get_clock; -} - static const VMStateDescription kvmclock_reliable_get_clock =3D { .name =3D "kvmclock/clock_is_reliable", .version_id =3D 1, .minimum_version_id =3D 1, - .needed =3D kvmclock_clock_is_reliable_needed, .fields =3D (const VMStateField[]) { VMSTATE_BOOL(clock_is_reliable, KVMClockState), VMSTATE_END_OF_LIST() @@ -364,18 +352,12 @@ static const VMStateDescription kvmclock_vmsd =3D { } }; =20 -static const Property kvmclock_properties[] =3D { - DEFINE_PROP_BOOL("x-mach-use-reliable-get-clock", KVMClockState, - mach_use_reliable_get_clock, true), -}; - static void kvmclock_class_init(ObjectClass *klass, const void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); =20 dc->realize =3D kvmclock_realize; dc->vmsd =3D &kvmclock_vmsd; - device_class_set_props(dc, kvmclock_properties); } =20 static const TypeInfo kvmclock_info =3D { --=20 2.53.0 From nobody Sat Apr 11 21:30:07 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1772708037; cv=none; d=zohomail.com; s=zohoarc; b=G3E4XmVoh2Q7wxWuEtUS0Z9kVwJWWbo+/Z1ORxwDX+kazeir/O4VfAv0ooHrENA8ktCnI3eZOOVzGLhQfKkdBja4qXSUrgGG5/zjcrxdgj8x60c6U17nfYzrFS4w+QIJewlyGZ9WhukoTD2CzSoYKUdd9vuvSy3CKl0PbtZVPCI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772708037; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=sIPvzYpL12uvOaK3bZqkj1A0eRdwMz2Qk1xQQRSzSOQ=; b=MVXbiu6fK24Kd1NPMQUWj0h09hC8RyorqWgLspO3+LB6AgRA/1jTQhnZ2kN0tvwXRbUdHoR8/WYIp9udSlwKh4e/vvw57s2u+lXQ/w/OX3f85Idcp+xFUfZAHY067cYSexi9/fmAuH2zcaGoMiOp4auVQzC6oXObXdG/8nb9jEs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772708037048362.8168393209784; Thu, 5 Mar 2026 02:53:57 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vy6Jt-0001HB-DX; Thu, 05 Mar 2026 05:52:41 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vy6Jq-0001Gb-N2 for qemu-devel@nongnu.org; Thu, 05 Mar 2026 05:52:39 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vy6Jp-0005UB-9e for qemu-devel@nongnu.org; Thu, 05 Mar 2026 05:52:38 -0500 Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-562-r-TzWz7pOVm5XA0HqjfJbg-1; Thu, 05 Mar 2026 05:52:33 -0500 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 252ED195609F; Thu, 5 Mar 2026 10:52:32 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.45.224.75]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 09A013003E98; Thu, 5 Mar 2026 10:52:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1772707956; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=sIPvzYpL12uvOaK3bZqkj1A0eRdwMz2Qk1xQQRSzSOQ=; b=H2wIo0skWjXfrle+mUA7nc+eNTzxDJaOLURXSYVxU5oYWLDRLliqqjUupMnpX5eAHh3bSv rWG0vAYvzarsa2vaQpoEcEZHqetNwhzw7ESVnc6H54pbhQyegTjA7T6fRLebc4eYcAQg9f 6PQlOwUqkI99nWdKoZbTcwxRI/AMiGc= X-MC-Unique: r-TzWz7pOVm5XA0HqjfJbg-1 X-Mimecast-MFC-AGG-ID: r-TzWz7pOVm5XA0HqjfJbg_1772707952 From: Thomas Huth To: Peter Maydell Cc: qemu-devel@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Igor Mammedov Subject: [PULL 04/28] hw/core/machine: Remove hw_compat_2_8[] array Date: Thu, 5 Mar 2026 11:51:51 +0100 Message-ID: <20260305105215.302571-5-thuth@redhat.com> In-Reply-To: <20260305105215.302571-1-thuth@redhat.com> References: <20260305105215.302571-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 33 X-Spam_score: 3.3 X-Spam_bar: +++ X-Spam_report: (3.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.703, RCVD_IN_VALIDITY_SAFE_BLOCKED=1.386, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1772708038241154100 From: Philippe Mathieu-Daud=C3=A9 The hw_compat_2_8[] array was only used by the pc-q35-2.8 and pc-i440fx-2.8 machines, which got removed. Remove it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20250501210456.89071-6-philmd@linaro.org> Reviewed-by: Igor Mammedov Signed-off-by: Thomas Huth Message-ID: <20260225092024.794595-5-thuth@redhat.com> --- include/hw/core/boards.h | 3 --- hw/core/machine.c | 14 -------------- 2 files changed, 17 deletions(-) diff --git a/include/hw/core/boards.h b/include/hw/core/boards.h index 12b21493789..a81c755541b 100644 --- a/include/hw/core/boards.h +++ b/include/hw/core/boards.h @@ -886,7 +886,4 @@ extern const size_t hw_compat_2_10_len; extern GlobalProperty hw_compat_2_9[]; extern const size_t hw_compat_2_9_len; =20 -extern GlobalProperty hw_compat_2_8[]; -extern const size_t hw_compat_2_8_len; - #endif diff --git a/hw/core/machine.c b/hw/core/machine.c index eae1f6be8d5..81f806a1ba3 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -272,20 +272,6 @@ GlobalProperty hw_compat_2_9[] =3D { }; const size_t hw_compat_2_9_len =3D G_N_ELEMENTS(hw_compat_2_9); =20 -GlobalProperty hw_compat_2_8[] =3D { - { "fw_cfg_mem", "x-file-slots", "0x10" }, - { "fw_cfg_io", "x-file-slots", "0x10" }, - { "pflash_cfi01", "old-multiple-chip-handling", "on" }, - { "pci-bridge", "shpc", "on" }, - { TYPE_PCI_DEVICE, "x-pcie-extcap-init", "off" }, - { "virtio-pci", "x-pcie-deverr-init", "off" }, - { "virtio-pci", "x-pcie-lnkctl-init", "off" }, - { "virtio-pci", "x-pcie-pm-init", "off" }, - { "cirrus-vga", "vgamem_mb", "8" }, - { "isa-cirrus-vga", "vgamem_mb", "8" }, -}; -const size_t hw_compat_2_8_len =3D G_N_ELEMENTS(hw_compat_2_8); - MachineState *current_machine; =20 static char *machine_get_kernel(Object *obj, Error **errp) --=20 2.53.0 From nobody Sat Apr 11 21:30:07 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1772708125; cv=none; d=zohomail.com; s=zohoarc; b=Ua0LxuusLJazCtV6RwkS+kW8Pqn+ghSlTOrml9AI5uAbv3tMcT/Vx1t+yBdmCZndRKG8IQ3NJdzDZcZcjza0mX2swZTuOm2juHhIz9AMQ+2aqpcyppsZjOtwV/vp2Oft3DkqoKCHrZGtbs8vxVbgvDTb+WUdg+d0XHhhRi3vUkk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772708125; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=zAZJFrpGsQlM0iLUcP8iLeNuAW6YZBG8VQ54J4+M1aY=; b=O5pcnBVCFzeMhaJ5JTRrbpbr4A0RjFb6zX1SGrtRC+QkYuTbju3mxaB5O2XJITG15R6ICna3lv2EzbYeQM3UEfVkrgiEELyJZYA5ytAczEHxC9yxpzteC8GVh9TEkGB29T2agvVpf54DWkutJ6iKq6vxN13CWbroWWsT/TVfRxw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772708125834619.8165667088156; Thu, 5 Mar 2026 02:55:25 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vy6Ju-0001Hg-P4; Thu, 05 Mar 2026 05:52:42 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vy6Jt-0001Gv-3c for qemu-devel@nongnu.org; Thu, 05 Mar 2026 05:52:41 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vy6Jr-0005UK-KV for qemu-devel@nongnu.org; Thu, 05 Mar 2026 05:52:40 -0500 Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-594-woofIRlsPx-XqePEo5QDJg-1; Thu, 05 Mar 2026 05:52:35 -0500 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id ED3D619560A3; Thu, 5 Mar 2026 10:52:34 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.45.224.75]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id D5B173003E98; Thu, 5 Mar 2026 10:52:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1772707959; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=zAZJFrpGsQlM0iLUcP8iLeNuAW6YZBG8VQ54J4+M1aY=; b=gptywUVM4mH4ph/PLGmqY6kV8YR0Igt+mUGm0o7vNBBsmWJjZdRE5AaIav8OopUgu2Nkvw 78jNaf1bn+q3FmeupQSueyuaf8d98U8P6AY47IpeCn9SH9MS+QU4raOGPduf3uLlG1fVLs 5hoIgUvFwBmS6sg5hCVfpiBw6MNEdXw= X-MC-Unique: woofIRlsPx-XqePEo5QDJg-1 X-Mimecast-MFC-AGG-ID: woofIRlsPx-XqePEo5QDJg_1772707955 From: Thomas Huth To: Peter Maydell Cc: qemu-devel@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Igor Mammedov Subject: [PULL 05/28] hw/block/pflash: Remove PFlashCFI01::old_multiple_chip_handling field Date: Thu, 5 Mar 2026 11:51:52 +0100 Message-ID: <20260305105215.302571-6-thuth@redhat.com> In-Reply-To: <20260305105215.302571-1-thuth@redhat.com> References: <20260305105215.302571-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 33 X-Spam_score: 3.3 X-Spam_bar: +++ X-Spam_report: (3.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.703, RCVD_IN_VALIDITY_SAFE_BLOCKED=1.386, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1772708127355158500 From: Philippe Mathieu-Daud=C3=A9 The PFlashCFI01::old_multiple_chip_handling boolean was only set in the hw_compat_2_8[] array, via the 'old-multiple-chip-handling=3Don' property. We removed all machines using that array, let's remove that property and all the code around it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20250501210456.89071-7-philmd@linaro.org> Reviewed-by: Igor Mammedov Reviewed-by: Thomas Huth Signed-off-by: Thomas Huth Message-ID: <20260225092024.794595-6-thuth@redhat.com> --- hw/block/pflash_cfi01.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/hw/block/pflash_cfi01.c b/hw/block/pflash_cfi01.c index c0f5b9d8fad..5b9ddb20b18 100644 --- a/hw/block/pflash_cfi01.c +++ b/hw/block/pflash_cfi01.c @@ -84,7 +84,6 @@ struct PFlashCFI01 { char *name; void *storage; VMChangeStateEntry *vmstate; - bool old_multiple_chip_handling; =20 /* block update buffer */ unsigned char *blk_bytes; @@ -703,13 +702,8 @@ static void pflash_cfi01_fill_cfi_table(PFlashCFI01 *p= fl) * in the cfi_table[]. */ num_devices =3D pfl->device_width ? (pfl->bank_width / pfl->device_wid= th) : 1; - if (pfl->old_multiple_chip_handling) { - blocks_per_device =3D pfl->nb_blocs / num_devices; - sector_len_per_device =3D pfl->sector_len; - } else { - blocks_per_device =3D pfl->nb_blocs; - sector_len_per_device =3D pfl->sector_len / num_devices; - } + blocks_per_device =3D pfl->nb_blocs; + sector_len_per_device =3D pfl->sector_len / num_devices; device_len =3D sector_len_per_device * blocks_per_device; =20 /* Hardcoded CFI table */ @@ -765,7 +759,7 @@ static void pflash_cfi01_fill_cfi_table(PFlashCFI01 *pf= l) pfl->cfi_table[0x2A] =3D 0x0B; } pfl->writeblock_size =3D 1 << pfl->cfi_table[0x2A]; - if (!pfl->old_multiple_chip_handling && num_devices > 1) { + if (num_devices > 1) { pfl->writeblock_size *=3D num_devices; } =20 @@ -930,8 +924,6 @@ static const Property pflash_cfi01_properties[] =3D { DEFINE_PROP_UINT16("id2", PFlashCFI01, ident2, 0), DEFINE_PROP_UINT16("id3", PFlashCFI01, ident3, 0), DEFINE_PROP_STRING("name", PFlashCFI01, name), - DEFINE_PROP_BOOL("old-multiple-chip-handling", PFlashCFI01, - old_multiple_chip_handling, false), }; =20 static void pflash_cfi01_class_init(ObjectClass *klass, const void *data) --=20 2.53.0 From nobody Sat Apr 11 21:30:07 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1772708026; cv=none; d=zohomail.com; s=zohoarc; b=GYM91XaXgKl0u9eCwrpl+lnURseAodOjr2BBIXfmEAfPvuaEiNvw3v++zJGaVzDYX7isiBtMej++2HADruAaNp450pKzaVKIig5cWDFKQ431Sh7KojSIRMaXDZqNMNQNkvBisNp2Jhc5ym27EcaXgtqYNuROCZEW7o2hWwrt41M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772708026; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=NGxdHjGhHX6nGTrNQWL0dAkWcG12NReciU8nGm0/SDo=; b=NTG6YxxuOhEKfrGj0Lg3vzsR7aZb7Lx0yzvkp5Oz4T/PiamLdVM4rw54UxAYWeZgoYQbVE1Xgh8YPqrRHxgILOJFf+guk97VvxuLrGekLH6BfM1ipBp2K0HHEDF5IXXFQ+H/7hSk1H/NZRvq0UJA22///fzCsYoQU5NRTIZ5Fdw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772708026522100.88074428894788; Thu, 5 Mar 2026 02:53:46 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vy6Jz-0001Hv-CC; Thu, 05 Mar 2026 05:52:47 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vy6Jy-0001Hm-MX for qemu-devel@nongnu.org; Thu, 05 Mar 2026 05:52:46 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vy6Jw-0005UX-3Y for qemu-devel@nongnu.org; Thu, 05 Mar 2026 05:52:45 -0500 Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-27-KHfd_2dXPxOOmwHZz2ftNg-1; Thu, 05 Mar 2026 05:52:39 -0500 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 43F691800344; Thu, 5 Mar 2026 10:52:38 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.45.224.75]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id B658D3003E98; Thu, 5 Mar 2026 10:52:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1772707963; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=NGxdHjGhHX6nGTrNQWL0dAkWcG12NReciU8nGm0/SDo=; b=SHiLL3sFTU5+giMX/KIHEEh6w3zk5CXNRrdoW1HEaOXmDGd/XnhbQvduCKEAQSS84ZaGZZ zWJltDHs03hYVxSLCaTD1nB2P8/AaeJcs9xxal9/iP8Y6J/2MqxV3tw/fLsKSh0HcAwTZO g/Re2cD+7U1YIUNe7SQ/ErpN6hcUbPA= X-MC-Unique: KHfd_2dXPxOOmwHZz2ftNg-1 X-Mimecast-MFC-AGG-ID: KHfd_2dXPxOOmwHZz2ftNg_1772707958 From: Thomas Huth To: Peter Maydell Cc: qemu-devel@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 06/28] hw/pci/pcie: Remove QEMU_PCIE_EXTCAP_INIT definition Date: Thu, 5 Mar 2026 11:51:53 +0100 Message-ID: <20260305105215.302571-7-thuth@redhat.com> In-Reply-To: <20260305105215.302571-1-thuth@redhat.com> References: <20260305105215.302571-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 0 X-Spam_score: -0.0 X-Spam_bar: / X-Spam_report: (-0.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.703, RCVD_IN_VALIDITY_SAFE_BLOCKED=1.386, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1772708027993154100 From: Philippe Mathieu-Daud=C3=A9 QEMU_PCIE_EXTCAP_INIT was only used by the hw_compat_2_8[] array, via the 'x-pcie-extcap-init=3Doff' property. We removed all machines using that array, let's remove all the code around QEMU_PCIE_EXTCAP_INIT. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20250501210456.89071-8-philmd@linaro.org> [thuth: Don't remove pci_set_long(), execute it always instead] Signed-off-by: Thomas Huth Message-ID: <20260225092024.794595-7-thuth@redhat.com> --- include/hw/pci/pci.h | 2 -- hw/pci/pci.c | 2 -- hw/pci/pcie.c | 6 ++---- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h index d9835dfd0dd..64141e92fec 100644 --- a/include/hw/pci/pci.h +++ b/include/hw/pci/pci.h @@ -219,8 +219,6 @@ enum { /* Link active status in endpoint capability is always set */ #define QEMU_PCIE_LNKSTA_DLLLA_BITNR 8 QEMU_PCIE_LNKSTA_DLLLA =3D (1 << QEMU_PCIE_LNKSTA_DLLLA_BITNR), -#define QEMU_PCIE_EXTCAP_INIT_BITNR 9 - QEMU_PCIE_EXTCAP_INIT =3D (1 << QEMU_PCIE_EXTCAP_INIT_BITNR), #define QEMU_PCIE_CXL_BITNR 10 QEMU_PCIE_CAP_CXL =3D (1 << QEMU_PCIE_CXL_BITNR), #define QEMU_PCIE_ERR_UNC_MASK_BITNR 11 diff --git a/hw/pci/pci.c b/hw/pci/pci.c index 90d6d71efdc..6399ebd41cb 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -84,8 +84,6 @@ static const Property pci_props[] =3D { QEMU_PCI_CAP_MULTIFUNCTION_BITNR, false), DEFINE_PROP_BIT("x-pcie-lnksta-dllla", PCIDevice, cap_present, QEMU_PCIE_LNKSTA_DLLLA_BITNR, true), - DEFINE_PROP_BIT("x-pcie-extcap-init", PCIDevice, cap_present, - QEMU_PCIE_EXTCAP_INIT_BITNR, true), DEFINE_PROP_STRING("failover_pair_id", PCIDevice, failover_pair_id), DEFINE_PROP_UINT32("acpi-index", PCIDevice, acpi_index, 0), diff --git a/hw/pci/pcie.c b/hw/pci/pcie.c index cae5061e69c..4622c75e48c 100644 --- a/hw/pci/pcie.c +++ b/hw/pci/pcie.c @@ -250,10 +250,8 @@ int pcie_cap_init(PCIDevice *dev, uint8_t offset, =20 pci_set_word(dev->wmask + pos + PCI_EXP_DEVCTL2, PCI_EXP_DEVCTL2_EETLP= PB); =20 - if (dev->cap_present & QEMU_PCIE_EXTCAP_INIT) { - /* read-only to behave like a 'NULL' Extended Capability Header */ - pci_set_long(dev->wmask + PCI_CONFIG_SPACE_SIZE, 0); - } + /* read-only to behave like a 'NULL' Extended Capability Header */ + pci_set_long(dev->wmask + PCI_CONFIG_SPACE_SIZE, 0); =20 return pos; } --=20 2.53.0 From nobody Sat Apr 11 21:30:07 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1772707978; cv=none; d=zohomail.com; s=zohoarc; b=l8qUL248iZefz67yewmmfvzytPJtr+NqzHqQaLWqKxKhCRYfBh+6nQyJCdclZeAhYnGwCp4Q7+srZLmyeIwoVzFPX8EbJzkBRJV4IceJap1J2avJJoGqVvmOgmWbuTb3ZqqWn7lWdsf77AxvbnXN3WRWanUi77Tz6EhUNz3TUCk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772707978; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=6hsiZRjp9wtNcFrHnonN7EpDfMxmnEWA1JVXjPxVHm0=; b=NUUNbhX5+d2XUhTkFe+lFT8LHrbJLhCW0eGe5COFe/e2fmTamkPZlCYj0es8ZhhBStURQSU9wqr97RcV3PNRebBU4lor2hCOHGrmWfu7LqEss2MKM1CA3QgXP5ksPhL+g9bkIDj0vKl80hNpsVH9VwcjMzCBS5Xuf8jaVoJeuJg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772707978043101.57741209666187; Thu, 5 Mar 2026 02:52:58 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vy6K4-0001L0-28; Thu, 05 Mar 2026 05:52:52 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vy6K2-0001Jr-1t for qemu-devel@nongnu.org; Thu, 05 Mar 2026 05:52:50 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vy6K0-0005Us-Ka for qemu-devel@nongnu.org; Thu, 05 Mar 2026 05:52:49 -0500 Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-631-6RoG7hpEPm6zgfRzxYY8lQ-1; Thu, 05 Mar 2026 05:52:42 -0500 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 96B981956048; Thu, 5 Mar 2026 10:52:41 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.45.224.75]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 422D13003E9C; Thu, 5 Mar 2026 10:52:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1772707967; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=6hsiZRjp9wtNcFrHnonN7EpDfMxmnEWA1JVXjPxVHm0=; b=Z5+QcGugCpACMBbsCmAchC6m2eRusdUZuMRoiST6y2JbvFvDU7Xi5j3Z+omgzT6q4go2fM KpmCjBNVC2AZm7wo9oWI7dPK6LyhuZgQmHNBAHjNH5l8LF+S7RH5ZTOfWdH5ePoryn2pDJ qF7Gf8jaUcOwqx5lJk4cKHdlGt35zTs= X-MC-Unique: 6RoG7hpEPm6zgfRzxYY8lQ-1 X-Mimecast-MFC-AGG-ID: 6RoG7hpEPm6zgfRzxYY8lQ_1772707961 From: Thomas Huth To: Peter Maydell Cc: qemu-devel@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Igor Mammedov Subject: [PULL 07/28] hw/virtio/virtio-pci: Remove VIRTIO_PCI_FLAG_INIT_DEVERR definition Date: Thu, 5 Mar 2026 11:51:54 +0100 Message-ID: <20260305105215.302571-8-thuth@redhat.com> In-Reply-To: <20260305105215.302571-1-thuth@redhat.com> References: <20260305105215.302571-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 33 X-Spam_score: 3.3 X-Spam_bar: +++ X-Spam_report: (3.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.703, RCVD_IN_VALIDITY_SAFE_BLOCKED=1.386, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1772707980903158500 From: Philippe Mathieu-Daud=C3=A9 VIRTIO_PCI_FLAG_INIT_DEVERR was only used by the hw_compat_2_8[] array, via the 'x-pcie-deverr-init=3Doff' property. We removed all machines using that array, lets remove all the code around VIRTIO_PCI_FLAG_INIT_DEVERR (see commit 9a4c0e220d8 for similar VIRTIO_PCI_FLAG_* enum removal). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20250501210456.89071-9-philmd@linaro.org> Reviewed-by: Igor Mammedov Signed-off-by: Thomas Huth Message-ID: <20260225092024.794595-8-thuth@redhat.com> --- include/hw/virtio/virtio-pci.h | 4 ---- hw/virtio/virtio-pci.c | 8 ++------ 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/include/hw/virtio/virtio-pci.h b/include/hw/virtio/virtio-pci.h index 581bb830b79..405e33a3165 100644 --- a/include/hw/virtio/virtio-pci.h +++ b/include/hw/virtio/virtio-pci.h @@ -35,7 +35,6 @@ enum { VIRTIO_PCI_FLAG_MODERN_PIO_NOTIFY_BIT, VIRTIO_PCI_FLAG_PAGE_PER_VQ_BIT, VIRTIO_PCI_FLAG_ATS_BIT, - VIRTIO_PCI_FLAG_INIT_DEVERR_BIT, VIRTIO_PCI_FLAG_INIT_LNKCTL_BIT, VIRTIO_PCI_FLAG_INIT_PM_BIT, VIRTIO_PCI_FLAG_INIT_FLR_BIT, @@ -63,9 +62,6 @@ enum { /* address space translation service */ #define VIRTIO_PCI_FLAG_ATS (1 << VIRTIO_PCI_FLAG_ATS_BIT) =20 -/* Init error enabling flags */ -#define VIRTIO_PCI_FLAG_INIT_DEVERR (1 << VIRTIO_PCI_FLAG_INIT_DEVERR_BIT) - /* Init Link Control register */ #define VIRTIO_PCI_FLAG_INIT_LNKCTL (1 << VIRTIO_PCI_FLAG_INIT_LNKCTL_BIT) =20 diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index c7b5a79b936..91d736d71c1 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -2307,10 +2307,8 @@ static void virtio_pci_realize(PCIDevice *pci_dev, E= rror **errp) proxy->last_pcie_cap_offset +=3D PCI_ERR_SIZEOF; } =20 - if (proxy->flags & VIRTIO_PCI_FLAG_INIT_DEVERR) { - /* Init error enabling flags */ - pcie_cap_deverr_init(pci_dev); - } + /* Init error enabling flags */ + pcie_cap_deverr_init(pci_dev); =20 if (proxy->flags & VIRTIO_PCI_FLAG_INIT_LNKCTL) { /* Init Link Control Register */ @@ -2446,8 +2444,6 @@ static const Property virtio_pci_properties[] =3D { VIRTIO_PCI_FLAG_ATS_BIT, false), DEFINE_PROP_BIT("x-ats-page-aligned", VirtIOPCIProxy, flags, VIRTIO_PCI_FLAG_ATS_PAGE_ALIGNED_BIT, true), - DEFINE_PROP_BIT("x-pcie-deverr-init", VirtIOPCIProxy, flags, - VIRTIO_PCI_FLAG_INIT_DEVERR_BIT, true), DEFINE_PROP_BIT("x-pcie-lnkctl-init", VirtIOPCIProxy, flags, VIRTIO_PCI_FLAG_INIT_LNKCTL_BIT, true), DEFINE_PROP_BIT("x-pcie-pm-init", VirtIOPCIProxy, flags, --=20 2.53.0 From nobody Sat Apr 11 21:30:07 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1772708017; cv=none; d=zohomail.com; s=zohoarc; b=YPTedt+Dp39Ws2QFSbHuFEklryrbylqzp+DLIqetF9EnnBLIv6SPZwZyt4ARqN8Bkn6epPRBCGGHyMmT53/TwuJc+0C/ipeVhdBaaZ29qcyY0J4uXyJ404Xiw6EfI+O4xgiRuzpR9/3c66bFwjQVzat30DeiLoAIMsWg3QDU0zQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772708017; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Bregcc+4oQuYkY0w0aiE1hvjZsqGY726rP2gyP7fHSY=; b=S89D3meddl4IIXW6AZt2s1CcpFBBUHpWivrYq06p3biSVjVwY6UaQ//KXQ2tojKShgxzcJyrxiIMRloY/A/ce51fCgWpoM19Xb2t9KQ2tHaoSqR2rLIPXF0tSSYpk/9sc7B8HjmHCaJy4mNCR1HG0wS0+BEYPbRDL8YBMHiEz8w= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772708017497307.85210693164777; Thu, 5 Mar 2026 02:53:37 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vy6K3-0001Kw-BJ; Thu, 05 Mar 2026 05:52:51 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vy6K2-0001Jv-5F for qemu-devel@nongnu.org; Thu, 05 Mar 2026 05:52:50 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vy6K0-0005Uq-L2 for qemu-devel@nongnu.org; Thu, 05 Mar 2026 05:52:49 -0500 Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-671-yYUk5moPMXy0maEdYyqlDg-1; Thu, 05 Mar 2026 05:52:45 -0500 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id E9B2518005B3; Thu, 5 Mar 2026 10:52:44 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.45.224.75]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 50E5A3003E9C; Thu, 5 Mar 2026 10:52:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1772707967; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Bregcc+4oQuYkY0w0aiE1hvjZsqGY726rP2gyP7fHSY=; b=duyXrBzUvwYAd0pdsFihooeYJSJarxNDSt2m8G/JpX2eGN6wBQkAhkViSK4A1LeQKFq3vD aqhoKNmr8CFYwihgxRbQd2+11z6bdQeVusb+oBitUN8zNGPFfFcIIg+pnDfinr9eHFXDDp p7Gvk3VDUE9e4tLgJJ42PLJ1zDh1/nQ= X-MC-Unique: yYUk5moPMXy0maEdYyqlDg-1 X-Mimecast-MFC-AGG-ID: yYUk5moPMXy0maEdYyqlDg_1772707965 From: Thomas Huth To: Peter Maydell Cc: qemu-devel@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Igor Mammedov Subject: [PULL 08/28] hw/virtio/virtio-pci: Remove VIRTIO_PCI_FLAG_INIT_LNKCTL definition Date: Thu, 5 Mar 2026 11:51:55 +0100 Message-ID: <20260305105215.302571-9-thuth@redhat.com> In-Reply-To: <20260305105215.302571-1-thuth@redhat.com> References: <20260305105215.302571-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 0 X-Spam_score: -0.0 X-Spam_bar: / X-Spam_report: (-0.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.703, RCVD_IN_VALIDITY_SAFE_BLOCKED=1.386, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1772708018890158500 From: Philippe Mathieu-Daud=C3=A9 VIRTIO_PCI_FLAG_INIT_LNKCTL was only used by the hw_compat_2_8[] array, via the 'x-pcie-lnkctl-init=3Doff' property. We removed all machines using that array, lets remove all the code around VIRTIO_PCI_FLAG_INIT_LNKCTL (see commit 9a4c0e220d8 for similar VIRTIO_PCI_FLAG_* enum removal). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20250501210456.89071-10-philmd@linaro.org> Reviewed-by: Igor Mammedov Signed-off-by: Thomas Huth Message-ID: <20260225092024.794595-9-thuth@redhat.com> --- include/hw/virtio/virtio-pci.h | 4 ---- hw/virtio/virtio-pci.c | 8 ++------ 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/include/hw/virtio/virtio-pci.h b/include/hw/virtio/virtio-pci.h index 405e33a3165..9760a3837fa 100644 --- a/include/hw/virtio/virtio-pci.h +++ b/include/hw/virtio/virtio-pci.h @@ -35,7 +35,6 @@ enum { VIRTIO_PCI_FLAG_MODERN_PIO_NOTIFY_BIT, VIRTIO_PCI_FLAG_PAGE_PER_VQ_BIT, VIRTIO_PCI_FLAG_ATS_BIT, - VIRTIO_PCI_FLAG_INIT_LNKCTL_BIT, VIRTIO_PCI_FLAG_INIT_PM_BIT, VIRTIO_PCI_FLAG_INIT_FLR_BIT, VIRTIO_PCI_FLAG_AER_BIT, @@ -62,9 +61,6 @@ enum { /* address space translation service */ #define VIRTIO_PCI_FLAG_ATS (1 << VIRTIO_PCI_FLAG_ATS_BIT) =20 -/* Init Link Control register */ -#define VIRTIO_PCI_FLAG_INIT_LNKCTL (1 << VIRTIO_PCI_FLAG_INIT_LNKCTL_BIT) - /* Init Power Management */ #define VIRTIO_PCI_FLAG_INIT_PM (1 << VIRTIO_PCI_FLAG_INIT_PM_BIT) =20 diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index 91d736d71c1..9e2201be13c 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -2310,10 +2310,8 @@ static void virtio_pci_realize(PCIDevice *pci_dev, E= rror **errp) /* Init error enabling flags */ pcie_cap_deverr_init(pci_dev); =20 - if (proxy->flags & VIRTIO_PCI_FLAG_INIT_LNKCTL) { - /* Init Link Control Register */ - pcie_cap_lnkctl_init(pci_dev); - } + /* Init Link Control Register */ + pcie_cap_lnkctl_init(pci_dev); =20 if (proxy->flags & VIRTIO_PCI_FLAG_PM_NO_SOFT_RESET) { pci_set_word(pci_dev->config + pos + PCI_PM_CTRL, @@ -2444,8 +2442,6 @@ static const Property virtio_pci_properties[] =3D { VIRTIO_PCI_FLAG_ATS_BIT, false), DEFINE_PROP_BIT("x-ats-page-aligned", VirtIOPCIProxy, flags, VIRTIO_PCI_FLAG_ATS_PAGE_ALIGNED_BIT, true), - DEFINE_PROP_BIT("x-pcie-lnkctl-init", VirtIOPCIProxy, flags, - VIRTIO_PCI_FLAG_INIT_LNKCTL_BIT, true), DEFINE_PROP_BIT("x-pcie-pm-init", VirtIOPCIProxy, flags, VIRTIO_PCI_FLAG_INIT_PM_BIT, true), DEFINE_PROP_BIT("x-pcie-pm-no-soft-reset", VirtIOPCIProxy, flags, --=20 2.53.0 From nobody Sat Apr 11 21:30:07 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1772708005; cv=none; d=zohomail.com; s=zohoarc; b=LeyiamtX96WHApWVLuAKr9qT2Iilt8BRd5I1EHYZp8zTU6jZ0vy5KAvIMhF1PIjTZfVpxl8d6pQLl43DHncPaxh0txRq/4XROuD49/qDMRmijTs7wbzB8xvN2r9WpXOamJcKsw2VUfH+RdZ14VjVQcgYD48A91eNtnX+pIoH1mE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772708005; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=XQ064cg7THdk5RbHXrVzn9h8msOLpA5PYOghjJpJfrc=; b=CFQhmc4SChthiqjHzKKyVq4apaTACwaX3ynoYTzgoZw/YaeBDgmlvvrOrmz4zl5AKMtBHfemkT0MI1Ss4sb2R7o1GVkvLH1phkqiZFAxXL/1VUfKS9chQTeIbYiXyXb5Y+9gq4M3r5L9ptCsdpTxu5yIuZa+E6SBLQ9c6s4JX44= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772708005380939.7029674674989; Thu, 5 Mar 2026 02:53:25 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vy6K7-0001PX-Qb; Thu, 05 Mar 2026 05:52:55 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vy6K6-0001OQ-BK for qemu-devel@nongnu.org; Thu, 05 Mar 2026 05:52:54 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vy6K4-0005VG-US for qemu-devel@nongnu.org; Thu, 05 Mar 2026 05:52:54 -0500 Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-689-_pKR90p-NJ6B0Zzy47k1uA-1; Thu, 05 Mar 2026 05:52:49 -0500 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 45CA418002C7; Thu, 5 Mar 2026 10:52:48 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.45.224.75]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id E0F923003E98; Thu, 5 Mar 2026 10:52:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1772707972; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=XQ064cg7THdk5RbHXrVzn9h8msOLpA5PYOghjJpJfrc=; b=WHNHcSxnZghWo4287BEuBvJLz9e6GiJ3v3ml1DxQJgW87/gTG3TPPqTUsIAdSCtxgHnupS 0yrosk6vsoD9uza4C/QLFEZVBQHu/09nzVpcAYlsjV1b/mubiU0TmPh+rsR0ARKhoL6ppW Aby9qhQWP/m7pyB5RQ7rpGC1OrAXHqA= X-MC-Unique: _pKR90p-NJ6B0Zzy47k1uA-1 X-Mimecast-MFC-AGG-ID: _pKR90p-NJ6B0Zzy47k1uA_1772707968 From: Thomas Huth To: Peter Maydell Cc: qemu-devel@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Igor Mammedov Subject: [PULL 09/28] hw/virtio/virtio-pci: Remove VIRTIO_PCI_FLAG_INIT_PM definition Date: Thu, 5 Mar 2026 11:51:56 +0100 Message-ID: <20260305105215.302571-10-thuth@redhat.com> In-Reply-To: <20260305105215.302571-1-thuth@redhat.com> References: <20260305105215.302571-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 0 X-Spam_score: -0.0 X-Spam_bar: / X-Spam_report: (-0.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.703, RCVD_IN_VALIDITY_SAFE_BLOCKED=1.386, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1772708006058154100 From: Philippe Mathieu-Daud=C3=A9 VIRTIO_PCI_FLAG_INIT_PM was only used by the hw_compat_2_8[] array, via the 'x-pcie-pm-init=3Doff' property. We removed all machines using that array, lets remove all the code around VIRTIO_PCI_FLAG_INIT_PM (see commit 9a4c0e220d8 for similar VIRTIO_PCI_FLAG_* enum removal). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20250501210456.89071-11-philmd@linaro.org> Reviewed-by: Igor Mammedov Signed-off-by: Thomas Huth Message-ID: <20260225092024.794595-10-thuth@redhat.com> --- include/hw/virtio/virtio-pci.h | 4 ---- hw/virtio/virtio-pci.c | 19 +++++-------------- 2 files changed, 5 insertions(+), 18 deletions(-) diff --git a/include/hw/virtio/virtio-pci.h b/include/hw/virtio/virtio-pci.h index 9760a3837fa..5cb20b73f62 100644 --- a/include/hw/virtio/virtio-pci.h +++ b/include/hw/virtio/virtio-pci.h @@ -35,7 +35,6 @@ enum { VIRTIO_PCI_FLAG_MODERN_PIO_NOTIFY_BIT, VIRTIO_PCI_FLAG_PAGE_PER_VQ_BIT, VIRTIO_PCI_FLAG_ATS_BIT, - VIRTIO_PCI_FLAG_INIT_PM_BIT, VIRTIO_PCI_FLAG_INIT_FLR_BIT, VIRTIO_PCI_FLAG_AER_BIT, VIRTIO_PCI_FLAG_ATS_PAGE_ALIGNED_BIT, @@ -61,9 +60,6 @@ enum { /* address space translation service */ #define VIRTIO_PCI_FLAG_ATS (1 << VIRTIO_PCI_FLAG_ATS_BIT) =20 -/* Init Power Management */ -#define VIRTIO_PCI_FLAG_INIT_PM (1 << VIRTIO_PCI_FLAG_INIT_PM_BIT) - /* Init The No_Soft_Reset bit of Power Management */ #define VIRTIO_PCI_FLAG_PM_NO_SOFT_RESET \ (1 << VIRTIO_PCI_FLAG_PM_NO_SOFT_RESET_BIT) diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index 9e2201be13c..0f5654f459e 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -2318,11 +2318,9 @@ static void virtio_pci_realize(PCIDevice *pci_dev, E= rror **errp) PCI_PM_CTRL_NO_SOFT_RESET); } =20 - if (proxy->flags & VIRTIO_PCI_FLAG_INIT_PM) { - /* Init Power Management Control Register */ - pci_set_word(pci_dev->wmask + pos + PCI_PM_CTRL, - PCI_PM_CTRL_STATE_MASK); - } + /* Init Power Management Control Register */ + pci_set_word(pci_dev->wmask + pos + PCI_PM_CTRL, + PCI_PM_CTRL_STATE_MASK); =20 if (proxy->flags & VIRTIO_PCI_FLAG_ATS) { pcie_ats_init(pci_dev, proxy->last_pcie_cap_offset, @@ -2418,16 +2416,11 @@ static void virtio_pci_bus_reset_hold(Object *obj, = ResetType type) virtio_pci_reset(qdev); =20 if (pci_is_express(dev)) { - VirtIOPCIProxy *proxy =3D VIRTIO_PCI(dev); - pcie_cap_deverr_reset(dev); pcie_cap_lnkctl_reset(dev); =20 - if (proxy->flags & VIRTIO_PCI_FLAG_INIT_PM) { - pci_word_test_and_clear_mask( - dev->config + dev->pm_cap + PCI_PM_CTRL, - PCI_PM_CTRL_STATE_MASK); - } + pci_word_test_and_clear_mask(dev->config + dev->pm_cap + PCI_PM_CT= RL, + PCI_PM_CTRL_STATE_MASK); } } =20 @@ -2442,8 +2435,6 @@ static const Property virtio_pci_properties[] =3D { VIRTIO_PCI_FLAG_ATS_BIT, false), DEFINE_PROP_BIT("x-ats-page-aligned", VirtIOPCIProxy, flags, VIRTIO_PCI_FLAG_ATS_PAGE_ALIGNED_BIT, true), - DEFINE_PROP_BIT("x-pcie-pm-init", VirtIOPCIProxy, flags, - VIRTIO_PCI_FLAG_INIT_PM_BIT, true), DEFINE_PROP_BIT("x-pcie-pm-no-soft-reset", VirtIOPCIProxy, flags, VIRTIO_PCI_FLAG_PM_NO_SOFT_RESET_BIT, false), DEFINE_PROP_BIT("x-pcie-flr-init", VirtIOPCIProxy, flags, --=20 2.53.0 From nobody Sat Apr 11 21:30:07 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1772708000; cv=none; d=zohomail.com; s=zohoarc; b=XIDXwgMTqJFn5LW28cq8rn5iF59EqN31EPJUPrzFk534zN81Z7cdIJ1BLhPDLzA5Os334GJc2vN8G8HBbJTzWHRIzi/+I1Y0D1qdB8YbVQEyDdImxKxghUCi7yDg+68K+LeMkJrYn6zac3pwneBqHnGmK3wRevgzfmcc8BkHnvM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772708000; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=V7aku+/Jhor42OZB+FAMdtWx+1uSJ9bXolR7vnugvTw=; b=VmdgfE1eOFYduFKf815nvpL4hMJtJdoWlJuFbSgFv+wSKsZIfoDYxMbr8gJzz67p6ht7wDEHyIQpzaWINP8LcDLNljFAS+5ISlTPb0SpO6eUBtPX7kbOf0/lx9Z/O68oZlnr2Py/LUtMJGqlPqmLhIkt6l8FjBiAHhksKC2bfr8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772708000186847.2227087186274; Thu, 5 Mar 2026 02:53:20 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vy6KD-0001WJ-PL; Thu, 05 Mar 2026 05:53:01 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vy6KC-0001Uv-FH for qemu-devel@nongnu.org; Thu, 05 Mar 2026 05:53:00 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vy6KB-0005Vo-0M for qemu-devel@nongnu.org; Thu, 05 Mar 2026 05:53:00 -0500 Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-427-37DAFhJPOO-AxHNy3NLxxQ-1; Thu, 05 Mar 2026 05:52:53 -0500 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 17C90195609F; Thu, 5 Mar 2026 10:52:52 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.45.224.75]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 3FBDD3003E98; Thu, 5 Mar 2026 10:52:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1772707978; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=V7aku+/Jhor42OZB+FAMdtWx+1uSJ9bXolR7vnugvTw=; b=V2ZfMUr1g++rYG97HEQlChHRAfAqDC/qf8EtfkBiQYhSH4OMYukGgX4YO6Zn94mxt+JyDm LZILDJ8xEtQ3GVOnb9DU1IAIIu14nVoHTy3UYU5dMYSK7P2uEgZ8HCYDjnXbvEN/mAtllJ +dtkJAfTVcSlDIFsWOcNWwPOrCpDlhQ= X-MC-Unique: 37DAFhJPOO-AxHNy3NLxxQ-1 X-Mimecast-MFC-AGG-ID: 37DAFhJPOO-AxHNy3NLxxQ_1772707972 From: Thomas Huth To: Peter Maydell Cc: qemu-devel@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Igor Mammedov Subject: [PULL 10/28] hw/i386/pc: Remove deprecated pc-q35-2.9 and pc-i440fx-2.9 machines Date: Thu, 5 Mar 2026 11:51:57 +0100 Message-ID: <20260305105215.302571-11-thuth@redhat.com> In-Reply-To: <20260305105215.302571-1-thuth@redhat.com> References: <20260305105215.302571-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 33 X-Spam_score: 3.3 X-Spam_bar: +++ X-Spam_report: (3.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.703, RCVD_IN_VALIDITY_SAFE_BLOCKED=1.386, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1772708001710154100 From: Philippe Mathieu-Daud=C3=A9 These machines has been supported for a period of more than 6 years. According to our versioned machine support policy (see commit ce80c4fa6ff "docs: document special exception for machine type deprecation & removal") they can now be removed. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20250501210456.89071-14-philmd@linaro.org> Reviewed-by: Igor Mammedov Signed-off-by: Thomas Huth Message-ID: <20260225092024.794595-11-thuth@redhat.com> --- hw/i386/pc_piix.c | 9 --------- hw/i386/pc_q35.c | 9 --------- 2 files changed, 18 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 58d76d2d410..d8417d1824f 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -705,15 +705,6 @@ static void pc_i440fx_machine_2_10_options(MachineClas= s *m) =20 DEFINE_I440FX_MACHINE(2, 10); =20 -static void pc_i440fx_machine_2_9_options(MachineClass *m) -{ - pc_i440fx_machine_2_10_options(m); - compat_props_add(m->compat_props, hw_compat_2_9, hw_compat_2_9_len); - compat_props_add(m->compat_props, pc_compat_2_9, pc_compat_2_9_len); -} - -DEFINE_I440FX_MACHINE(2, 9); - #ifdef CONFIG_XEN static void xenfv_machine_4_2_options(MachineClass *m) { diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 7fe6ca64f9d..b94d1839e3f 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -652,12 +652,3 @@ static void pc_q35_machine_2_10_options(MachineClass *= m) } =20 DEFINE_Q35_MACHINE(2, 10); - -static void pc_q35_machine_2_9_options(MachineClass *m) -{ - pc_q35_machine_2_10_options(m); - compat_props_add(m->compat_props, hw_compat_2_9, hw_compat_2_9_len); - compat_props_add(m->compat_props, pc_compat_2_9, pc_compat_2_9_len); -} - -DEFINE_Q35_MACHINE(2, 9); --=20 2.53.0 From nobody Sat Apr 11 21:30:07 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1772708115; cv=none; d=zohomail.com; s=zohoarc; b=aLTcBh4fUaYEQAF7rF8rANxOIskonbfLKmkPt75htM+wT3TbPOzkg0so5IttSCiGWVD1LlBUchy4UE4+wConblYwc4p360cWEwQSennvUdm0HGH/uQt/lSAizTo94HcfFr2LBfEkx3Ck5IDKY0rwRZN1FB0+3mdepBQzXtsdGQU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772708115; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=byyq8G41m4pYPNByJ9SZ0nj8MSCQvNRIcpQumdv4U5g=; b=gsiue1nLiNxneqVWJpP7UB1S/akTnySExBNPVlfhj30yFnA+J55kb1d5W5wiLcJqU8lX4ieTWdkbCNGEoeSfD0rnoAtDNV1MN9/3GGlOQ9Uu7Rn3KX5Wjhi27sQQ+ST5VHu72tnVRiskKwW70eLVA/NdZZqS9SyQ99cUEmpI6s0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772708115384734.3609443344668; Thu, 5 Mar 2026 02:55:15 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vy6KG-0001gI-IG; Thu, 05 Mar 2026 05:53:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vy6KE-0001Wk-90 for qemu-devel@nongnu.org; Thu, 05 Mar 2026 05:53:02 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vy6KC-0005Vz-TL for qemu-devel@nongnu.org; Thu, 05 Mar 2026 05:53:02 -0500 Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-180-N4howcc4O_Sbvt6Q1sWVlw-1; Thu, 05 Mar 2026 05:52:56 -0500 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id A963519560B2; Thu, 5 Mar 2026 10:52:55 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.45.224.75]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 13AFA3003E9E; Thu, 5 Mar 2026 10:52:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1772707980; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=byyq8G41m4pYPNByJ9SZ0nj8MSCQvNRIcpQumdv4U5g=; b=S3vSU890/9TPAVsLDRrn3XhN3/w4bJQt83YANzKaEwfCHeSLD0Io5HXr1aGMvaAXC1I1ZP zO+OPXWb6vpN6rUcg7iSzhALIwQDTwTDwMb5K2ppPyqWOsCJvp3iLtAy9ECcT8KaOXl5e9 26P45vME22LVOQIEK4l30QfmtmZr42k= X-MC-Unique: N4howcc4O_Sbvt6Q1sWVlw-1 X-Mimecast-MFC-AGG-ID: N4howcc4O_Sbvt6Q1sWVlw_1772707975 From: Thomas Huth To: Peter Maydell Cc: qemu-devel@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Igor Mammedov Subject: [PULL 11/28] hw/i386/pc: Remove pc_compat_2_9[] array Date: Thu, 5 Mar 2026 11:51:58 +0100 Message-ID: <20260305105215.302571-12-thuth@redhat.com> In-Reply-To: <20260305105215.302571-1-thuth@redhat.com> References: <20260305105215.302571-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 33 X-Spam_score: 3.3 X-Spam_bar: +++ X-Spam_report: (3.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.703, RCVD_IN_VALIDITY_SAFE_BLOCKED=1.386, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1772708117544158500 From: Philippe Mathieu-Daud=C3=A9 The pc_compat_2_9[] array was only used by the pc-q35-2.9 and pc-i440fx-2.9 machines, which got removed. Remove it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20250501210456.89071-15-philmd@linaro.org> Reviewed-by: Igor Mammedov Signed-off-by: Thomas Huth Message-ID: <20260225092024.794595-12-thuth@redhat.com> --- include/hw/i386/pc.h | 3 --- hw/i386/pc.c | 5 ----- 2 files changed, 8 deletions(-) diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index d8fe1c3c8e5..307c120b8a2 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -289,9 +289,6 @@ extern const size_t pc_compat_2_11_len; extern GlobalProperty pc_compat_2_10[]; extern const size_t pc_compat_2_10_len; =20 -extern GlobalProperty pc_compat_2_9[]; -extern const size_t pc_compat_2_9_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 d36b4917b31..8329988013e 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -242,11 +242,6 @@ GlobalProperty pc_compat_2_10[] =3D { }; const size_t pc_compat_2_10_len =3D G_N_ELEMENTS(pc_compat_2_10); =20 -GlobalProperty pc_compat_2_9[] =3D { - { "mch", "extended-tseg-mbytes", "0" }, -}; -const size_t pc_compat_2_9_len =3D G_N_ELEMENTS(pc_compat_2_9); - /* * @PC_FW_DATA: * Size of the chunk of memory at the top of RAM for the BIOS ACPI tables --=20 2.53.0 From nobody Sat Apr 11 21:30:07 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1772708005; cv=none; d=zohomail.com; s=zohoarc; b=ZOvf5rsU/SJvwdWuw9SXiA68Af4QVmZr7+AfAK9NT4eqHYYpN4cFNIKrqtTi+JgiPyanpmNm6cHYKL6x/eEL9TEmYKLCK9eK13ECNAOL1rwUNGBxsIFpyq7P3DDpm7KnMozBZGTvPkyaqECMDEoJp27YZUXKtnbIShQ4XGwQx/A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772708005; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=CM4Dt/KTFp1wOax0B32zWQJ1LptZ957ha7UVGRHjiO4=; b=QtiALzOGCqqYksJgMx++pRZb4td0YrRhDyFsV82I6tjMp7kB5Jarfpk4wiMJWa8eEo4aTMGGTbFvo/od0NS9mEMpETfna24QPmWTBaVD3RoMxOZoMFTWPigiA0XP4w7sccOA6DOIuXfmAWEDXscCXxY7ZZM6+Nac9b/NfLjmhUE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772708005516397.50117869808366; Thu, 5 Mar 2026 02:53:25 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vy6KJ-0001nE-D5; Thu, 05 Mar 2026 05:53:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vy6KG-0001iN-Su for qemu-devel@nongnu.org; Thu, 05 Mar 2026 05:53:04 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vy6KF-0005WI-Fq for qemu-devel@nongnu.org; Thu, 05 Mar 2026 05:53:04 -0500 Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-232-u5air3JbPU-6652_SJY-fQ-1; Thu, 05 Mar 2026 05:52:59 -0500 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id B623D180034F; Thu, 5 Mar 2026 10:52:58 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.45.224.75]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 68F6B3003E98; Thu, 5 Mar 2026 10:52:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1772707982; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=CM4Dt/KTFp1wOax0B32zWQJ1LptZ957ha7UVGRHjiO4=; b=ADYlth2kf+M5ARW7Yk57TOgo/xSHFqPDhg7aRAJS06s5wTYJ0fNi+gCt0UfUXRhlytqI64 w8cRwPWTkjJP62wrpajz+6F2qusRza/SrGnAaCbn8c4EyLeHU0itJ09DuAnmT5VyMVk42R of5YJLAQial0RnxBJTmw2211y0DXGfQ= X-MC-Unique: u5air3JbPU-6652_SJY-fQ-1 X-Mimecast-MFC-AGG-ID: u5air3JbPU-6652_SJY-fQ_1772707978 From: Thomas Huth To: Peter Maydell Cc: qemu-devel@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Igor Mammedov Subject: [PULL 12/28] hw/core/machine: Remove hw_compat_2_9[] array Date: Thu, 5 Mar 2026 11:51:59 +0100 Message-ID: <20260305105215.302571-13-thuth@redhat.com> In-Reply-To: <20260305105215.302571-1-thuth@redhat.com> References: <20260305105215.302571-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 0 X-Spam_score: -0.0 X-Spam_bar: / X-Spam_report: (-0.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.703, RCVD_IN_VALIDITY_SAFE_BLOCKED=1.386, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1772708007750154100 From: Philippe Mathieu-Daud=C3=A9 The hw_compat_2_9[] array was only used by the pc-q35-2.9 and pc-i440fx-2.9 machines, which got removed. Remove it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20250501210456.89071-16-philmd@linaro.org> Reviewed-by: Igor Mammedov Signed-off-by: Thomas Huth Message-ID: <20260225092024.794595-13-thuth@redhat.com> --- include/hw/core/boards.h | 3 --- hw/core/machine.c | 8 -------- 2 files changed, 11 deletions(-) diff --git a/include/hw/core/boards.h b/include/hw/core/boards.h index a81c755541b..bc3193ecbd3 100644 --- a/include/hw/core/boards.h +++ b/include/hw/core/boards.h @@ -883,7 +883,4 @@ extern const size_t hw_compat_2_11_len; extern GlobalProperty hw_compat_2_10[]; extern const size_t hw_compat_2_10_len; =20 -extern GlobalProperty hw_compat_2_9[]; -extern const size_t hw_compat_2_9_len; - #endif diff --git a/hw/core/machine.c b/hw/core/machine.c index 81f806a1ba3..b47bb411b64 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -264,14 +264,6 @@ GlobalProperty hw_compat_2_10[] =3D { }; const size_t hw_compat_2_10_len =3D G_N_ELEMENTS(hw_compat_2_10); =20 -GlobalProperty hw_compat_2_9[] =3D { - { "pci-bridge", "shpc", "off" }, - { "intel-iommu", "pt", "off" }, - { "virtio-net-device", "x-mtu-bypass-backend", "off" }, - { "pcie-root-port", "x-migrate-msix", "false" }, -}; -const size_t hw_compat_2_9_len =3D G_N_ELEMENTS(hw_compat_2_9); - MachineState *current_machine; =20 static char *machine_get_kernel(Object *obj, Error **errp) --=20 2.53.0 From nobody Sat Apr 11 21:30:07 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1772708061; cv=none; d=zohomail.com; s=zohoarc; b=UloKUW9AoLyA9jX4TCtWeE5jlc6scJ+DLiSunJf3WJCqLNTCKkSG9o/uAKlooxG8g23b9sh6kAUBUBoeMHutFFK+r/Rpnf6apByugrKtbhueOQEMJn7TN3gE7URgC+yDoXcyB7rxep7+6PB6q536FrMX6CKhB1JBCqTanB2nNv0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772708061; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=6ekLPVHYOVkLZAradQmSaJNW1TZzwmRdnf71YAxurjM=; b=OBTBSeUkaBmS5i0yz2wq+z7S3J5neGaYJttam7l7DWWEHpIntKiT+Vj3w/Na8StCQEZELkON10JV31f9+1FIhf49Ccj121pKXvAs0jtPO3ATkSi4gQcM0SfGrTGYrXAF1VOHvPsqMA+7k4UWhOjnNfdf6yVAJc4a2S8gciyCKwI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772708061467972.3248689040425; Thu, 5 Mar 2026 02:54:21 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vy6KN-0001ss-2S; Thu, 05 Mar 2026 05:53:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vy6KK-0001s3-Nz for qemu-devel@nongnu.org; Thu, 05 Mar 2026 05:53:08 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vy6KI-0005Wc-NO for qemu-devel@nongnu.org; Thu, 05 Mar 2026 05:53:08 -0500 Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-157-O5rzmCneONaPHOuIok8u9Q-1; Thu, 05 Mar 2026 05:53:02 -0500 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id C7C09195605C; Thu, 5 Mar 2026 10:53:01 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.45.224.75]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id B5A743003E98; Thu, 5 Mar 2026 10:52:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1772707985; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=6ekLPVHYOVkLZAradQmSaJNW1TZzwmRdnf71YAxurjM=; b=aLSk1+kLGRuKPc21Jr7EQolPgGCWRFA+blww4B1292yIPKwtKuhtHCicUSxXC/SJIE1jK3 239W0aZ5Cq1LCKkFBnjORkXdYiHT96BWx4cQQBdEFi6xhcrcSBav270TPknP6YRgC9f1nG IQPGG/2Y4j3q8ffeJtI4nno2RXHTxd4= X-MC-Unique: O5rzmCneONaPHOuIok8u9Q-1 X-Mimecast-MFC-AGG-ID: O5rzmCneONaPHOuIok8u9Q_1772707981 From: Thomas Huth To: Peter Maydell Cc: qemu-devel@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Igor Mammedov Subject: [PULL 13/28] hw/net/virtio-net: Remove VirtIONet::mtu_bypass_backend field Date: Thu, 5 Mar 2026 11:52:00 +0100 Message-ID: <20260305105215.302571-14-thuth@redhat.com> In-Reply-To: <20260305105215.302571-1-thuth@redhat.com> References: <20260305105215.302571-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 33 X-Spam_score: 3.3 X-Spam_bar: +++ X-Spam_report: (3.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.703, RCVD_IN_VALIDITY_SAFE_BLOCKED=1.386, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1772708062539154100 From: Philippe Mathieu-Daud=C3=A9 The VirtIONet::mtu_bypass_backend boolean was only set in the hw_compat_2_9[] array, via the 'x-mtu-bypass-backend=3Doff' property. We removed all machines using that array, lets remove that property and all the code around it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20250501210456.89071-17-philmd@linaro.org> Reviewed-by: Igor Mammedov [thuth: Adjusted patch for latest changes in the master branch] Signed-off-by: Thomas Huth Message-ID: <20260225092024.794595-14-thuth@redhat.com> --- include/hw/virtio/virtio-net.h | 1 - hw/net/virtio-net.c | 8 ++------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/include/hw/virtio/virtio-net.h b/include/hw/virtio/virtio-net.h index 5b8ab7bda79..371e3764282 100644 --- a/include/hw/virtio/virtio-net.h +++ b/include/hw/virtio/virtio-net.h @@ -218,7 +218,6 @@ struct VirtIONet { uint64_t saved_guest_offloads; AnnounceTimer announce_timer; bool needs_vnet_hdr_swap; - bool mtu_bypass_backend; /* primary failover device is hidden*/ bool failover_primary_hidden; bool failover; diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index eccb48ad426..2a5d642a647 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -935,8 +935,7 @@ static void virtio_net_set_features(VirtIODevice *vdev, int i; =20 virtio_features_copy(features, in_features); - if (n->mtu_bypass_backend && - !virtio_has_feature(vdev->backend_features, VIRTIO_NET_F_MTU))= { + if (!virtio_has_feature(vdev->backend_features, VIRTIO_NET_F_MTU)) { virtio_clear_feature_ex(features, VIRTIO_NET_F_MTU); } =20 @@ -3160,8 +3159,7 @@ static void virtio_net_get_features(VirtIODevice *vde= v, uint64_t *features, vhost_net_get_features_ex(get_vhost_net(nc->peer), features); virtio_features_copy(vdev->backend_features_ex, features); =20 - if (n->mtu_bypass_backend && - (n->host_features & 1ULL << VIRTIO_NET_F_MTU)) { + if ((n->host_features & 1ULL << VIRTIO_NET_F_MTU) !=3D 0) { virtio_add_feature_ex(features, VIRTIO_NET_F_MTU); } =20 @@ -4251,8 +4249,6 @@ static const Property virtio_net_properties[] =3D { DEFINE_PROP_UINT16("tx_queue_size", VirtIONet, net_conf.tx_queue_size, VIRTIO_NET_TX_QUEUE_DEFAULT_SIZE), DEFINE_PROP_UINT16("host_mtu", VirtIONet, net_conf.mtu, 0), - DEFINE_PROP_BOOL("x-mtu-bypass-backend", VirtIONet, mtu_bypass_backend, - true), DEFINE_PROP_INT32("speed", VirtIONet, net_conf.speed, SPEED_UNKNOWN), DEFINE_PROP_STRING("duplex", VirtIONet, net_conf.duplex_str), DEFINE_PROP_BOOL("failover", VirtIONet, failover, false), --=20 2.53.0 From nobody Sat Apr 11 21:30:07 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1772708079; cv=none; d=zohomail.com; s=zohoarc; b=he01YZ2hdSwV3GZLWzuWp5quR1bebUrl2j772WLyQcj/kK/fv5MeAyeLlBCICmjH6TPG9vASyZpor2ubbezgTi2ZBGkS0+2IWUy5Pc4E71a4XBYY451lr/7VIiXrsLKQ87Q3mMAf6V6Ibc50Mlw4U9hGERrwNy/lzNbQ3d5miik= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772708079; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=pmw/mt6SvPPUlFNzcpYSmwcoiUFpZ+UTBo7tRVygtpo=; b=XzuNXtaju/CD3s+zNpvIgR8C6ToyFeF4EVY23A5q6Ab2dJ759MdbvH1tKufmhcWx6kwLDG5+cRTE8IruUSeYaxoNcFd+HsNxoSvgqNCf6Qb7HI+VXn44x8fOlM0cmXBWGlknwcpxKH7T1jcUAQxAD2tQfWoNYWyZmMqlqIrlO2U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772708079799188.23261190322842; Thu, 5 Mar 2026 02:54:39 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vy6Ka-0002Fq-8b; Thu, 05 Mar 2026 05:53:25 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vy6KS-00025Z-OE for qemu-devel@nongnu.org; Thu, 05 Mar 2026 05:53:16 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vy6KR-0005XO-0U for qemu-devel@nongnu.org; Thu, 05 Mar 2026 05:53:16 -0500 Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-586-HAVjhztCOheaf2n62fCVEQ-1; Thu, 05 Mar 2026 05:53:11 -0500 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 26491195608D; Thu, 5 Mar 2026 10:53:05 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.45.224.75]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 8D3C73003E98; Thu, 5 Mar 2026 10:53:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1772707994; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=pmw/mt6SvPPUlFNzcpYSmwcoiUFpZ+UTBo7tRVygtpo=; b=FGaNKNIBNghZJr9upjVv2K0GQ9H6KGEYfdl1RuUdWYaIrF6seSYu3mkR6mU8nNQFZLhcpL eUPHOvN2ls/ofJfGYzXRxOy/LWGn7Lm55VGfMwKOAyXOPyfWpq2A+iZJ6kMhmzKPV0oIBI YDtZrarMQNMmWRZQaMzuS1sQMU7LlL0= X-MC-Unique: HAVjhztCOheaf2n62fCVEQ-1 X-Mimecast-MFC-AGG-ID: HAVjhztCOheaf2n62fCVEQ_1772707985 From: Thomas Huth To: Peter Maydell Cc: qemu-devel@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Igor Mammedov Subject: [PULL 14/28] hw/pci-bridge/gen_pcie_rp: Remove GenPCIERootPort::migrate_msix field Date: Thu, 5 Mar 2026 11:52:01 +0100 Message-ID: <20260305105215.302571-15-thuth@redhat.com> In-Reply-To: <20260305105215.302571-1-thuth@redhat.com> References: <20260305105215.302571-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 33 X-Spam_score: 3.3 X-Spam_bar: +++ X-Spam_report: (3.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.703, RCVD_IN_VALIDITY_SAFE_BLOCKED=1.386, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1772708081118158500 From: Philippe Mathieu-Daud=C3=A9 The GenPCIERootPort::migrate_msix boolean was only set in the hw_compat_2_9[] array, via the 'x-migrate-msix=3Dfalse' property. We removed all machines using that array, lets remove that property and all the code around it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20250501210456.89071-18-philmd@linaro.org> Reviewed-by: Igor Mammedov Signed-off-by: Thomas Huth Message-ID: <20260225092024.794595-15-thuth@redhat.com> --- hw/pci-bridge/gen_pcie_root_port.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/hw/pci-bridge/gen_pcie_root_port.c b/hw/pci-bridge/gen_pcie_ro= ot_port.c index 2f7257d166a..5434d693d92 100644 --- a/hw/pci-bridge/gen_pcie_root_port.c +++ b/hw/pci-bridge/gen_pcie_root_port.c @@ -35,8 +35,6 @@ struct GenPCIERootPort { PCIESlot parent_obj; /*< public >*/ =20 - bool migrate_msix; - /* additional resources to reserve */ PCIResReserve res_reserve; }; @@ -66,13 +64,6 @@ static void gen_rp_interrupts_uninit(PCIDevice *d) msix_uninit_exclusive_bar(d); } =20 -static bool gen_rp_test_migrate_msix(void *opaque, int version_id) -{ - GenPCIERootPort *rp =3D opaque; - - return rp->migrate_msix; -} - static void gen_rp_realize(DeviceState *dev, Error **errp) { PCIDevice *d =3D PCI_DEVICE(dev); @@ -121,16 +112,13 @@ static const VMStateDescription vmstate_rp_dev =3D { VMSTATE_PCI_DEVICE(parent_obj.parent_obj.parent_obj, PCIESlot), VMSTATE_STRUCT(parent_obj.parent_obj.parent_obj.exp.aer_log, PCIESlot, 0, vmstate_pcie_aer_log, PCIEAERLog), - VMSTATE_MSIX_TEST(parent_obj.parent_obj.parent_obj.parent_obj, - GenPCIERootPort, - gen_rp_test_migrate_msix), + VMSTATE_MSIX(parent_obj.parent_obj.parent_obj.parent_obj, + GenPCIERootPort), VMSTATE_END_OF_LIST() } }; =20 static const Property gen_rp_props[] =3D { - DEFINE_PROP_BOOL("x-migrate-msix", GenPCIERootPort, - migrate_msix, true), DEFINE_PROP_UINT32("bus-reserve", GenPCIERootPort, res_reserve.bus, -1), DEFINE_PROP_SIZE("io-reserve", GenPCIERootPort, --=20 2.53.0 From nobody Sat Apr 11 21:30:07 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1772708048; cv=none; d=zohomail.com; s=zohoarc; b=frslx1v0yoaFEv3hJFwrcJt264auB2g/OPC3X0xC/iADRWRnJSxAY+QcJ1hC4YqUF9z+6uq6ovIOv4rgB8LD5zR5Z0Dk33OxCWY3Y3F9pZ+d2IeM/1rRydO93q8Syi74jJqewz3QjgATM4zF7VeLrS/corMotIUsYAJi2KnqrGs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772708048; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=WGufQVVnK5xgBPXxXLTfCZsGiCOh4ONCo+TXCTm/xPM=; b=Ag7XpwhygDi3gIiD4/uBc+LCms7BKg+mCkjlZjfYmYueFC9P8DHjwTpt0mvBgLcrQPua623FklQZQWTicDsuATTo0JQlnGONUFRDP0vzdRFkPpFeMX0MgqMYaeZE9lpNCCWIdA6AKP2sFI3eYbBEReOCdCr9IEu38ovZez4PT4U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772708048042131.6344799945108; Thu, 5 Mar 2026 02:54:08 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vy6KT-00026R-03; Thu, 05 Mar 2026 05:53:17 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vy6KR-0001yO-26 for qemu-devel@nongnu.org; Thu, 05 Mar 2026 05:53:15 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vy6KO-0005X7-U5 for qemu-devel@nongnu.org; Thu, 05 Mar 2026 05:53:14 -0500 Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-255-xKaA29BcPGKUxzleTO3OPA-1; Thu, 05 Mar 2026 05:53:09 -0500 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 362421956080; Thu, 5 Mar 2026 10:53:08 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.45.224.75]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id DCFA53003E98; Thu, 5 Mar 2026 10:53:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1772707992; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=WGufQVVnK5xgBPXxXLTfCZsGiCOh4ONCo+TXCTm/xPM=; b=XAtzY2EQQN349o8kHgk0o7FtmyTVigY+on99ur3/KsoPZ2wk0q2Vvvj72BemgbPSG2iw54 slruMAKU3Mwm5//UHdmprpI789hE7u/myZzqI1EJxM+oXmMujqpC8sxlshNqed6PzvSWuY r2FMhdqUHzjARdU09MvpOATKRlyIx38= X-MC-Unique: xKaA29BcPGKUxzleTO3OPA-1 X-Mimecast-MFC-AGG-ID: xKaA29BcPGKUxzleTO3OPA_1772707988 From: Thomas Huth To: Peter Maydell Cc: qemu-devel@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Igor Mammedov Subject: [PULL 15/28] hw/i386/x86-iommu: Remove X86IOMMUState::pt_supported field Date: Thu, 5 Mar 2026 11:52:02 +0100 Message-ID: <20260305105215.302571-16-thuth@redhat.com> In-Reply-To: <20260305105215.302571-1-thuth@redhat.com> References: <20260305105215.302571-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 33 X-Spam_score: 3.3 X-Spam_bar: +++ X-Spam_report: (3.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.703, RCVD_IN_VALIDITY_SAFE_BLOCKED=1.386, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1772708049028158500 From: Philippe Mathieu-Daud=C3=A9 The X86IOMMUState::pt_supported boolean was only set in the hw_compat_2_9[] array, via the 'pt=3Doff' property. We removed all machines using that array, lets remove that property and all the code around it, always setting the VTD_ECAP_PT capability. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20250501210456.89071-19-philmd@linaro.org> [thuth: Dropped the hunks that were already merged via commit 31753d5a336f] Reviewed-by: Igor Mammedov Signed-off-by: Thomas Huth Message-ID: <20260225092024.794595-16-thuth@redhat.com> --- include/hw/i386/x86-iommu.h | 1 - hw/i386/intel_iommu.c | 13 ++----------- hw/i386/x86-iommu.c | 1 - 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/include/hw/i386/x86-iommu.h b/include/hw/i386/x86-iommu.h index c526a047ab6..0a1e1ba7257 100644 --- a/include/hw/i386/x86-iommu.h +++ b/include/hw/i386/x86-iommu.h @@ -63,7 +63,6 @@ struct X86IOMMUState { SysBusDevice busdev; OnOffAuto intr_supported; /* Whether vIOMMU supports IR */ bool dt_supported; /* Whether vIOMMU supports DT */ - bool pt_supported; /* Whether vIOMMU supports pass-through */ bool dma_translation; /* Whether vIOMMU supports DMA translation= */ QLIST_HEAD(, IEC_Notifier) iec_notifiers; /* IEC notify list */ }; diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c index 4924aa43750..d24ba989bfc 100644 --- a/hw/i386/intel_iommu.c +++ b/hw/i386/intel_iommu.c @@ -1072,6 +1072,7 @@ static inline bool vtd_ce_type_check(X86IOMMUState *x= 86_iommu, { switch (vtd_ce_get_type(ce)) { case VTD_CONTEXT_TT_MULTI_LEVEL: + case VTD_CONTEXT_TT_PASS_THROUGH: /* Always supported */ break; case VTD_CONTEXT_TT_DEV_IOTLB: @@ -1080,12 +1081,6 @@ static inline bool vtd_ce_type_check(X86IOMMUState *= x86_iommu, return false; } break; - case VTD_CONTEXT_TT_PASS_THROUGH: - if (!x86_iommu->pt_supported) { - error_report_once("%s: PT specified but not supported", __func= __); - return false; - } - break; default: /* Unknown type */ error_report_once("%s: unknown ce type: %"PRIu32, __func__, @@ -5004,7 +4999,7 @@ static void vtd_cap_init(IntelIOMMUState *s) { X86IOMMUState *x86_iommu =3D X86_IOMMU_DEVICE(s); =20 - s->cap =3D VTD_CAP_FRO | VTD_CAP_NFR | VTD_CAP_ND | + s->cap =3D VTD_CAP_FRO | VTD_CAP_NFR | VTD_CAP_ND | VTD_ECAP_PT | VTD_CAP_MAMV | VTD_CAP_PSI | VTD_CAP_SSLPS | VTD_CAP_ESRTPS | VTD_CAP_MGAW(s->aw_bits); if (s->dma_drain) { @@ -5032,10 +5027,6 @@ static void vtd_cap_init(IntelIOMMUState *s) s->ecap |=3D VTD_ECAP_DT; } =20 - if (x86_iommu->pt_supported) { - s->ecap |=3D VTD_ECAP_PT; - } - if (s->caching_mode) { s->cap |=3D VTD_CAP_CM; } diff --git a/hw/i386/x86-iommu.c b/hw/i386/x86-iommu.c index 33ac0bfc97e..a57445404ef 100644 --- a/hw/i386/x86-iommu.c +++ b/hw/i386/x86-iommu.c @@ -129,7 +129,6 @@ static const Property x86_iommu_properties[] =3D { DEFINE_PROP_ON_OFF_AUTO("intremap", X86IOMMUState, intr_supported, ON_OFF_AUTO_AUTO), DEFINE_PROP_BOOL("device-iotlb", X86IOMMUState, dt_supported, false), - DEFINE_PROP_BOOL("pt", X86IOMMUState, pt_supported, true), DEFINE_PROP_BOOL("dma-translation", X86IOMMUState, dma_translation, tr= ue), }; =20 --=20 2.53.0 From nobody Sat Apr 11 21:30:07 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1772708023; cv=none; d=zohomail.com; s=zohoarc; b=nPMZ0h4STrXszsEXmL9KJRmWWxdnG0pjuJpySRD5fpmWXOgCNwN8fWw0fusXSZzafgm2AuTZFSGpxUYm8yHs1ydG+YkhfW/i8ZjAbsF4VGrSIXjla2Rsm1fIorvkdFOMKtcx9SqSFwD+HOmb5OSfsaKwTOf/3j9q+lnZQdXv1+k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772708023; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=X+6jyk7poB0UCekuUq+atl80jUksDmTZW7oSmAcUmYY=; b=lGpGXkBMw8e5yPMT3iLUdNIurRYE0yTmLVnu6SYlk0wk2DUNqKgN+LQDMpTuCQsn3x9yS0V28e0Ed2YiEXm/95KDJ9ZZoiRdsf3ftY7MM0thidqsvvO0M5TrKK/3JGfbFzu6rKZN/rWlNu4lxmrXrzcNpRU1JACvQ7co2CDQh9w= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772708023089902.2299148144851; Thu, 5 Mar 2026 02:53:43 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vy6KW-0002E0-10; Thu, 05 Mar 2026 05:53:20 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vy6KR-00020e-Hk for qemu-devel@nongnu.org; Thu, 05 Mar 2026 05:53:15 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vy6KQ-0005XG-1J for qemu-devel@nongnu.org; Thu, 05 Mar 2026 05:53:15 -0500 Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-645-FlTQ2tkqOza3tECSVDtfcA-1; Thu, 05 Mar 2026 05:53:12 -0500 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 25202195608E; Thu, 5 Mar 2026 10:53:11 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.45.224.75]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 3D4BE3003E9C; Thu, 5 Mar 2026 10:53:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1772707993; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=X+6jyk7poB0UCekuUq+atl80jUksDmTZW7oSmAcUmYY=; b=VoOw6wlQuFmzHR4Ojgp/m2AJYjCr0TRHiLO4KEyuHYPeoP5mjeo81o+J2FO+QnHVpBNKLC z70yzd274UxjjafPpgzaUqxdbuuGMlwvItPUi0wzNCHll6FL6+6hQNN6bxCaO3nkHE89Ve O9V28dUACa0zRZYvzBlt9FkNbC8y1VY= X-MC-Unique: FlTQ2tkqOza3tECSVDtfcA-1 X-Mimecast-MFC-AGG-ID: FlTQ2tkqOza3tECSVDtfcA_1772707991 From: Thomas Huth To: Peter Maydell Cc: qemu-devel@nongnu.org, Fabiano Rosas , Igor Mammedov Subject: [PULL 16/28] tests/qtest/test-x86-cpuid-compat: Remove the test with the i440fx-2.9 machine Date: Thu, 5 Mar 2026 11:52:03 +0100 Message-ID: <20260305105215.302571-17-thuth@redhat.com> In-Reply-To: <20260305105215.302571-1-thuth@redhat.com> References: <20260305105215.302571-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 33 X-Spam_score: 3.3 X-Spam_bar: +++ X-Spam_report: (3.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.703, RCVD_IN_VALIDITY_SAFE_BLOCKED=1.386, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1772708024899158500 Content-Type: text/plain; charset="utf-8" From: Thomas Huth The machine has been removed, so the related test can now be removed, too. Reviewed-by: Fabiano Rosas Reviewed-by: Igor Mammedov Signed-off-by: Thomas Huth Message-ID: <20260225092024.794595-17-thuth@redhat.com> --- tests/qtest/test-x86-cpuid-compat.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/tests/qtest/test-x86-cpuid-compat.c b/tests/qtest/test-x86-cpu= id-compat.c index 5e0547e81b7..c534e764f82 100644 --- a/tests/qtest/test-x86-cpuid-compat.c +++ b/tests/qtest/test-x86-cpuid-compat.c @@ -343,17 +343,6 @@ int main(int argc, char **argv) "486", "xlevel2=3D0xC0000002,xstore=3Don", NULL, "xlevel2", 0xC0000002); =20 - /* Check compatibility of old machine-types that didn't - * auto-increase level/xlevel/xlevel2: */ - if (qtest_has_machine("pc-i440fx-2.9")) { - add_cpuid_test("x86/cpuid/auto-level7/pc-i440fx-2.9/off", - "Conroe", NULL, "pc-i440fx-2.9", - "level", 10); - add_cpuid_test("x86/cpuid/auto-level7/pc-i440fx-2.9/on", - "Conroe", "erms=3Don", "pc-i440fx-2.9", - "level", 10); - } - /* Test feature parsing */ add_feature_test("x86/cpuid/features/plus", "486", "+arat", --=20 2.53.0 From nobody Sat Apr 11 21:30:07 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1772708114; cv=none; d=zohomail.com; s=zohoarc; b=bHO1o67sCIRO+sQKpG1NHJKssmk//cHGHsvyY/R1QhTbWRbue76ZrcpWZAhA+kU+DBQ04lIlFDuAYSaCEn+YoV7Bw23HtMileYRU4/rXYxgphLlDEMBP3QmEwZVs+P4QA24w9vnYhgUfBYqxs6rk9wKB4ah9j8BEkOXstF3k6tc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772708114; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=aTC/GI6BoVqcrlD5Ik7OXRLO7op6ND8nqQYpT/YyYj0=; b=FXmPdIjFgskODZCqIkgHyMwVJ575MSCFGCvan7RbkZxIhEUfDO5ENAh8Wusu0pPkY9PKB8cOt1f0TX94poL/tOB1XGJVPAtnZonML+FG79LUKNCW/H+LxEhsZNFHhb1+wUDP/dHF/O+9QG6jC0o9U98xZtKx7T1GhJnWhUljxUc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772708114835396.0204896292681; Thu, 5 Mar 2026 02:55:14 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vy6Kd-0002R2-6O; Thu, 05 Mar 2026 05:53:27 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vy6KX-0002Fh-9e for qemu-devel@nongnu.org; Thu, 05 Mar 2026 05:53:22 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vy6KV-0005Y8-TM for qemu-devel@nongnu.org; Thu, 05 Mar 2026 05:53:21 -0500 Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-591-HC8qb9jpNOSa_c7MIjOTuA-1; Thu, 05 Mar 2026 05:53:15 -0500 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 970361956080; Thu, 5 Mar 2026 10:53:14 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.45.224.75]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id C12D33003E9C; Thu, 5 Mar 2026 10:53:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1772707999; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=aTC/GI6BoVqcrlD5Ik7OXRLO7op6ND8nqQYpT/YyYj0=; b=LUbiT/DcB0QYSl0Lx77644nZ56UpwsSdNdvF/lPqWfc4kNSPAtaD79VL+RYg0OXkGQioiU TR3ZJJ3QfiKLywMEOWQ3Df19kuRKYbdjQTr20WCaT7W55YRiPzfn2O6Q62/zlCspgdJ+DZ 48FH1kmj23oP0o145oeaQ818FGaJxgk= X-MC-Unique: HC8qb9jpNOSa_c7MIjOTuA-1 X-Mimecast-MFC-AGG-ID: HC8qb9jpNOSa_c7MIjOTuA_1772707994 From: Thomas Huth To: Peter Maydell Cc: qemu-devel@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Xiaoyao Li Subject: [PULL 17/28] hw/i386/pc: Remove deprecated pc-q35-2.10 and pc-i440fx-2.10 machines Date: Thu, 5 Mar 2026 11:52:04 +0100 Message-ID: <20260305105215.302571-18-thuth@redhat.com> In-Reply-To: <20260305105215.302571-1-thuth@redhat.com> References: <20260305105215.302571-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 33 X-Spam_score: 3.3 X-Spam_bar: +++ X-Spam_report: (3.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.703, RCVD_IN_VALIDITY_SAFE_BLOCKED=1.386, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1772708117390154100 From: Philippe Mathieu-Daud=C3=A9 These machines has been supported for a period of more than 6 years. According to our versioned machine support policy (see commit ce80c4fa6ff "docs: document special exception for machine type deprecation & removal") they can now be removed. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20250501223522.99772-2-philmd@linaro.org> Reviewed-by: Thomas Huth Reviewed-by: Xiaoyao Li Signed-off-by: Thomas Huth --- hw/i386/pc_piix.c | 10 ---------- hw/i386/pc_q35.c | 10 ---------- 2 files changed, 20 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index d8417d1824f..64927b47d92 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -695,16 +695,6 @@ static void pc_i440fx_machine_2_11_options(MachineClas= s *m) =20 DEFINE_I440FX_MACHINE(2, 11); =20 -static void pc_i440fx_machine_2_10_options(MachineClass *m) -{ - pc_i440fx_machine_2_11_options(m); - compat_props_add(m->compat_props, hw_compat_2_10, hw_compat_2_10_len); - compat_props_add(m->compat_props, pc_compat_2_10, pc_compat_2_10_len); - m->auto_enable_numa_with_memhp =3D false; -} - -DEFINE_I440FX_MACHINE(2, 10); - #ifdef CONFIG_XEN static void xenfv_machine_4_2_options(MachineClass *m) { diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index b94d1839e3f..ad40e9045b2 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -642,13 +642,3 @@ static void pc_q35_machine_2_11_options(MachineClass *= m) } =20 DEFINE_Q35_MACHINE(2, 11); - -static void pc_q35_machine_2_10_options(MachineClass *m) -{ - pc_q35_machine_2_11_options(m); - compat_props_add(m->compat_props, hw_compat_2_10, hw_compat_2_10_len); - compat_props_add(m->compat_props, pc_compat_2_10, pc_compat_2_10_len); - m->auto_enable_numa_with_memhp =3D false; -} - -DEFINE_Q35_MACHINE(2, 10); --=20 2.53.0 From nobody Sat Apr 11 21:30:07 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1772708038; cv=none; d=zohomail.com; s=zohoarc; b=QIaUnavAM3PVE0hxat1TctCkhbXUu492L2RcxMg8xvz07uIwcvkIyKH6NV/87yECIQVqotaDMXDk6pwRK94qrHmTk9+HMq86NvplTte+9IEGWFlKZ8+KTzL2PWVhINAEsZ/Q5XgSR5+5XHWzp1SFw0Mps8BjmHS4uYJRE6fTods= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772708038; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Jd1hKHeCxl9t+/TaRpY6R5FxoeLFf4ZzQD5LIlTpNp4=; b=TdhCEpTukN3RC4csrT3wNtm3YVJn1vkoNivS+NG4IlZmprp5ftsuTZ+/247ll7M2hIPcAAO4zB6jAYW7bIfIfR3YhH/fNOfiCioGswf8VsZ3jgFrymvXloQRyaWo12Z0n3HqLCpNjEiPKyFxZH7N5JPQvYzISuxUG6plubavStA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772708038039818.6010996316913; Thu, 5 Mar 2026 02:53:58 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vy6Kd-0002YR-Ti; Thu, 05 Mar 2026 05:53:28 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vy6Ka-0002GV-5p for qemu-devel@nongnu.org; Thu, 05 Mar 2026 05:53:24 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vy6KY-0005YX-R8 for qemu-devel@nongnu.org; Thu, 05 Mar 2026 05:53:23 -0500 Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-213-acKu-DvZMYOTNzIflsP8OA-1; Thu, 05 Mar 2026 05:53:18 -0500 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id B4D1E195605F; Thu, 5 Mar 2026 10:53:17 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.45.224.75]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 58DD43003E98; Thu, 5 Mar 2026 10:53:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1772708002; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Jd1hKHeCxl9t+/TaRpY6R5FxoeLFf4ZzQD5LIlTpNp4=; b=cJGOl195GUKz+Ai/3Xbwvs47mhpR20UiqsQxFAVT+GvNErjy2Qhj0X7hKcbN3Ak79sE/Dn KWDtLJ7mqIbu5aB7+yO0e4MD1zpJSqr8vhzRkE+DiSLccHBBXz8zHayz9B5F8VypZXFnIa DLvKp87NrtBcZSUYZO0Vk1SaT9rxric= X-MC-Unique: acKu-DvZMYOTNzIflsP8OA-1 X-Mimecast-MFC-AGG-ID: acKu-DvZMYOTNzIflsP8OA_1772707997 From: Thomas Huth To: Peter Maydell Cc: qemu-devel@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Xiaoyao Li Subject: [PULL 18/28] hw/i386/pc: Remove pc_compat_2_10[] array Date: Thu, 5 Mar 2026 11:52:05 +0100 Message-ID: <20260305105215.302571-19-thuth@redhat.com> In-Reply-To: <20260305105215.302571-1-thuth@redhat.com> References: <20260305105215.302571-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 33 X-Spam_score: 3.3 X-Spam_bar: +++ X-Spam_report: (3.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.703, RCVD_IN_VALIDITY_SAFE_BLOCKED=1.386, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1772708040209154100 From: Philippe Mathieu-Daud=C3=A9 The pc_compat_2_10[] array was only used by the pc-q35-2.10 and pc-i440fx-2.10 machines, which got removed. Remove it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20250501223522.99772-3-philmd@linaro.org> Reviewed-by: Thomas Huth Reviewed-by: Xiaoyao Li Signed-off-by: Thomas Huth --- include/hw/i386/pc.h | 3 --- hw/i386/pc.c | 7 ------- 2 files changed, 10 deletions(-) diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 307c120b8a2..03ef7ba2494 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -286,9 +286,6 @@ extern const size_t pc_compat_2_12_len; extern GlobalProperty pc_compat_2_11[]; extern const size_t pc_compat_2_11_len; =20 -extern GlobalProperty pc_compat_2_10[]; -extern const size_t pc_compat_2_10_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 8329988013e..59cfe4f01cd 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -235,13 +235,6 @@ GlobalProperty pc_compat_2_11[] =3D { }; const size_t pc_compat_2_11_len =3D G_N_ELEMENTS(pc_compat_2_11); =20 -GlobalProperty pc_compat_2_10[] =3D { - { TYPE_X86_CPU, "x-hv-max-vps", "0x40" }, - { "i440FX-pcihost", "x-pci-hole64-fix", "off" }, - { "q35-pcihost", "x-pci-hole64-fix", "off" }, -}; -const size_t pc_compat_2_10_len =3D G_N_ELEMENTS(pc_compat_2_10); - /* * @PC_FW_DATA: * Size of the chunk of memory at the top of RAM for the BIOS ACPI tables --=20 2.53.0 From nobody Sat Apr 11 21:30:07 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1772708064; cv=none; d=zohomail.com; s=zohoarc; b=nkPxRIOSMOT8TySCeWPkWxAEbvsVtSEHXfy5wrksZp99Wk5QO5kV4x8637oC8pm2MFqKL4yPXCOqmCvfVN9vWQ2HywFXqXOIuqjBkpDIVyzUbiO7L1qBL5XHDaj8IYyucJWog1rObt2Se3aXazVZAZ5cIxsnbZCuKFPsktLzIYk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772708064; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=UF6Dso2itn/3ESk+NM4HgSMdzC4V7xHqiWg2my0AHdc=; b=lX0zDgCzALccwNKOpNm05V6K5ubQyMIyrsJQbWT+H/w+xs3KdUFYntD122n/FrgzhHfDBr28G/+4iBdIy6TiN36PRapZn7TiCE7rC/EHg4lP6Z/sa5F+/j9wADxObC/uJ4ghGBbo2w9Psp8DgbwQSQQRKjCLOv5OJbPdH5bzKpk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772708064256891.4734306952723; Thu, 5 Mar 2026 02:54:24 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vy6Ke-0002d0-J4; Thu, 05 Mar 2026 05:53:28 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vy6Kd-0002Qm-3G for qemu-devel@nongnu.org; Thu, 05 Mar 2026 05:53:27 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vy6Kb-0005Yw-Je for qemu-devel@nongnu.org; Thu, 05 Mar 2026 05:53:26 -0500 Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-663-CnmvxvKPPT6O_mzJ7GqUvA-1; Thu, 05 Mar 2026 05:53:21 -0500 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 7A7D11800283; Thu, 5 Mar 2026 10:53:20 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.45.224.75]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 3CF063003E9E; Thu, 5 Mar 2026 10:53:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1772708004; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UF6Dso2itn/3ESk+NM4HgSMdzC4V7xHqiWg2my0AHdc=; b=H0skHejlCm79XzowpS55ymCaIxXTfWn5fbQMEEKl4XjBYjLSsLycvlmkAsERMVOYC84SOf lrsDjWxkH3dqTHUXWjYV1ppzQRwpRnRngvF00TdkrRXd5nFt6buv6Ohda484w+9M8hzbR4 EJt9d3Tg+PW4sgVTm59KKkbsa8jd5Do= X-MC-Unique: CnmvxvKPPT6O_mzJ7GqUvA-1 X-Mimecast-MFC-AGG-ID: CnmvxvKPPT6O_mzJ7GqUvA_1772708000 From: Thomas Huth To: Peter Maydell Cc: qemu-devel@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Xiaoyao Li Subject: [PULL 19/28] hw/i386/pc: Remove deprecated pc-q35-2.11 and pc-i440fx-2.11 machines Date: Thu, 5 Mar 2026 11:52:06 +0100 Message-ID: <20260305105215.302571-20-thuth@redhat.com> In-Reply-To: <20260305105215.302571-1-thuth@redhat.com> References: <20260305105215.302571-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 0 X-Spam_score: -0.0 X-Spam_bar: / X-Spam_report: (-0.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.703, RCVD_IN_VALIDITY_SAFE_BLOCKED=1.386, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1772708066642154100 From: Philippe Mathieu-Daud=C3=A9 These machines has been supported for a period of more than 6 years. According to our versioned machine support policy (see commit ce80c4fa6ff "docs: document special exception for machine type deprecation & removal") they can now be removed. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20250501223522.99772-6-philmd@linaro.org> Reviewed-by: Thomas Huth Reviewed-by: Xiaoyao Li Signed-off-by: Thomas Huth --- hw/i386/pc_piix.c | 9 --------- hw/i386/pc_q35.c | 10 ---------- 2 files changed, 19 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 64927b47d92..8a4b6509444 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -686,15 +686,6 @@ static void pc_i440fx_machine_2_12_options(MachineClas= s *m) =20 DEFINE_I440FX_MACHINE(2, 12); =20 -static void pc_i440fx_machine_2_11_options(MachineClass *m) -{ - pc_i440fx_machine_2_12_options(m); - compat_props_add(m->compat_props, hw_compat_2_11, hw_compat_2_11_len); - compat_props_add(m->compat_props, pc_compat_2_11, pc_compat_2_11_len); -} - -DEFINE_I440FX_MACHINE(2, 11); - #ifdef CONFIG_XEN static void xenfv_machine_4_2_options(MachineClass *m) { diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index ad40e9045b2..60a1b75b450 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -632,13 +632,3 @@ static void pc_q35_machine_2_12_options(MachineClass *= m) } =20 DEFINE_Q35_MACHINE(2, 12); - -static void pc_q35_machine_2_11_options(MachineClass *m) -{ - pc_q35_machine_2_12_options(m); - m->default_nic =3D "e1000"; - compat_props_add(m->compat_props, hw_compat_2_11, hw_compat_2_11_len); - compat_props_add(m->compat_props, pc_compat_2_11, pc_compat_2_11_len); -} - -DEFINE_Q35_MACHINE(2, 11); --=20 2.53.0 From nobody Sat Apr 11 21:30:07 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1772708128; cv=none; d=zohomail.com; s=zohoarc; b=HUsDZLP+XqJeNeGjUZfiTRj+BkNHu+cslYv3X6M0kx9TPyNHxHihHhvdZBmk5+BF/Bpc/ZWaEpCBLS0uJnnrbC0maC5VODlsMA43OoVS3nKNybt9rSYwEkOmSAq3LlFxXuvlVhGTfnRs2buvUDfVcxEJOpFrdrkwy35Gf1SDk24= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772708128; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=wERVYuYFtsmb5v6RNc2/80JTdVVVn3E4qgvfpiRlAfw=; b=f42nKvJUAVRjxtflRtUk5C1GbMxvBIxDToPBQ64SzJ35FkOjrclVy4d7ehWb+4seKurkkRod4z8uDpXXJ+OIKsezjNvu3JN85DY90JFI12RxSzv3gB5MlzsCc0jNJ5dfJ8NgeK0Vr5iuglAoTzHeZgs51sXnhlFqD+WDLyg/ORA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772708128856320.815234454093; Thu, 5 Mar 2026 02:55:28 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vy6Ki-0002xh-Bl; Thu, 05 Mar 2026 05:53:32 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vy6Kg-0002oV-5g for qemu-devel@nongnu.org; Thu, 05 Mar 2026 05:53:30 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vy6Ke-0005aT-P5 for qemu-devel@nongnu.org; Thu, 05 Mar 2026 05:53:29 -0500 Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-115-JCVrwV2FOcCu2GakezXGfw-1; Thu, 05 Mar 2026 05:53:24 -0500 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id D022B18002E3; Thu, 5 Mar 2026 10:53:23 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.45.224.75]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 054A33003E98; Thu, 5 Mar 2026 10:53:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1772708008; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wERVYuYFtsmb5v6RNc2/80JTdVVVn3E4qgvfpiRlAfw=; b=SQjOE4O8sEaRZUG2PrZg1+r4xCwBIDsUTRKUUM3HQ+oICg1pWuxuV2XhxYQx2ZtfbxmCIa Za63SgtoWBkkgaTE2UHGEfY/OXSNJhV8su5blJfeGkLcuNRn22RKCp7uOQGve6Kbt0UfoR xLwWiJYnnyO/lzQM9MPfP8KbPAzQDBY= X-MC-Unique: JCVrwV2FOcCu2GakezXGfw-1 X-Mimecast-MFC-AGG-ID: JCVrwV2FOcCu2GakezXGfw_1772708003 From: Thomas Huth To: Peter Maydell Cc: qemu-devel@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Xiaoyao Li Subject: [PULL 20/28] hw/i386/pc: Remove pc_compat_2_11[] array Date: Thu, 5 Mar 2026 11:52:07 +0100 Message-ID: <20260305105215.302571-21-thuth@redhat.com> In-Reply-To: <20260305105215.302571-1-thuth@redhat.com> References: <20260305105215.302571-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 0 X-Spam_score: -0.0 X-Spam_bar: / X-Spam_report: (-0.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.703, RCVD_IN_VALIDITY_SAFE_BLOCKED=1.386, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1772708129340158500 From: Philippe Mathieu-Daud=C3=A9 The pc_compat_2_11[] array was only used by the pc-q35-2.11 and pc-i440fx-2.11 machines, which got removed. Remove it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20250501223522.99772-7-philmd@linaro.org> Reviewed-by: Thomas Huth Reviewed-by: Xiaoyao Li Signed-off-by: Thomas Huth --- include/hw/i386/pc.h | 3 --- hw/i386/pc.c | 6 ------ 2 files changed, 9 deletions(-) diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 03ef7ba2494..a3b270ccc97 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -283,9 +283,6 @@ extern const size_t pc_compat_3_0_len; extern GlobalProperty pc_compat_2_12[]; extern const size_t pc_compat_2_12_len; =20 -extern GlobalProperty pc_compat_2_11[]; -extern const size_t pc_compat_2_11_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 59cfe4f01cd..6427c62dbcd 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -229,12 +229,6 @@ GlobalProperty pc_compat_2_12[] =3D { }; const size_t pc_compat_2_12_len =3D G_N_ELEMENTS(pc_compat_2_12); =20 -GlobalProperty pc_compat_2_11[] =3D { - { TYPE_X86_CPU, "x-migrate-smi-count", "off" }, - { "Skylake-Server" "-" TYPE_X86_CPU, "clflushopt", "off" }, -}; -const size_t pc_compat_2_11_len =3D G_N_ELEMENTS(pc_compat_2_11); - /* * @PC_FW_DATA: * Size of the chunk of memory at the top of RAM for the BIOS ACPI tables --=20 2.53.0 From nobody Sat Apr 11 21:30:07 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1772708078; cv=none; d=zohomail.com; s=zohoarc; b=emnkzsKDJyxjr8w39bRQN/EpXNY9zqFhLWrf1isBZohLbyTbSiGGVvxaURMkJP0VrAQg9SbbG34Juunqtjztssxu0WZHN/MvFCwgj459OV/V2pSqm2TgQMvt4f9zkHcm3wbOtjW4l57bJ0+MrRvpjTcqMFt4WK9832bnRJDcxd8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772708078; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=JKTr060o4+MXQpk2S9vIlG+TMnH0QhKNwWcZ0exgGnk=; b=JSbR5SU2z10OdoThjPUfaljSgbKkrtUIcYjmKuMhbpOGdXJtloo0Xit/vFdFLLAh2eLuLdJBpO+DJaWSh9hfYYDCrQV8HpSwnRmx/RTxUZ/VA1QCpRyySwqjS3wBi95AFPNevLBtLjNq9BT6adDuwq0V3Q4+A8CS8qIbuMzR1q4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772708078799676.1802672203836; Thu, 5 Mar 2026 02:54:38 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vy6Kl-00031S-4X; Thu, 05 Mar 2026 05:53:35 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vy6Kk-00030C-17 for qemu-devel@nongnu.org; Thu, 05 Mar 2026 05:53:34 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vy6Ki-0005by-Ia for qemu-devel@nongnu.org; Thu, 05 Mar 2026 05:53:33 -0500 Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-629-ZxhelDvlPqWOoDtlqjn_og-1; Thu, 05 Mar 2026 05:53:28 -0500 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 65D4B180047F; Thu, 5 Mar 2026 10:53:27 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.45.224.75]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 8DCD83003E9E; Thu, 5 Mar 2026 10:53:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1772708011; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JKTr060o4+MXQpk2S9vIlG+TMnH0QhKNwWcZ0exgGnk=; b=XFrtpx4e//FHsPPlOYRhoQOj2qwqpiJg5LfKUUuTQqaQ/l68VqW81QWVi/ixE0n3PneeKy 9ZA672RgOUWAPeZrgg/kaB9LnpLGNA7m8c9UzUrMWYDc9OVa7rXVSDDJo0HIOIxc89gakM gBW2Ytm46rA9tt+tYqpfWJd5460Od7A= X-MC-Unique: ZxhelDvlPqWOoDtlqjn_og-1 X-Mimecast-MFC-AGG-ID: ZxhelDvlPqWOoDtlqjn_og_1772708007 From: Thomas Huth To: Peter Maydell Cc: qemu-devel@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Xiaoyao Li Subject: [PULL 21/28] hw/i386/pc: Remove deprecated pc-q35-2.12 and pc-i440fx-2.12 machines Date: Thu, 5 Mar 2026 11:52:08 +0100 Message-ID: <20260305105215.302571-22-thuth@redhat.com> In-Reply-To: <20260305105215.302571-1-thuth@redhat.com> References: <20260305105215.302571-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 0 X-Spam_score: -0.0 X-Spam_bar: / X-Spam_report: (-0.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.703, RCVD_IN_VALIDITY_SAFE_BLOCKED=1.386, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1772708079131158500 From: Philippe Mathieu-Daud=C3=A9 These machines has been supported for a period of more than 6 years. According to our versioned machine support policy (see commit ce80c4fa6ff "docs: document special exception for machine type deprecation & removal") they can now be removed. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20250501223522.99772-8-philmd@linaro.org> Reviewed-by: Thomas Huth Reviewed-by: Xiaoyao Li Signed-off-by: Thomas Huth --- hw/i386/pc_piix.c | 9 --------- hw/i386/pc_q35.c | 9 --------- 2 files changed, 18 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 8a4b6509444..961432176cf 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -677,15 +677,6 @@ static void pc_i440fx_machine_3_0_options(MachineClass= *m) =20 DEFINE_I440FX_MACHINE(3, 0); =20 -static void pc_i440fx_machine_2_12_options(MachineClass *m) -{ - pc_i440fx_machine_3_0_options(m); - compat_props_add(m->compat_props, hw_compat_2_12, hw_compat_2_12_len); - compat_props_add(m->compat_props, pc_compat_2_12, pc_compat_2_12_len); -} - -DEFINE_I440FX_MACHINE(2, 12); - #ifdef CONFIG_XEN static void xenfv_machine_4_2_options(MachineClass *m) { diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 60a1b75b450..261d759a223 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -623,12 +623,3 @@ static void pc_q35_machine_3_0_options(MachineClass *m) } =20 DEFINE_Q35_MACHINE(3, 0); - -static void pc_q35_machine_2_12_options(MachineClass *m) -{ - pc_q35_machine_3_0_options(m); - compat_props_add(m->compat_props, hw_compat_2_12, hw_compat_2_12_len); - compat_props_add(m->compat_props, pc_compat_2_12, pc_compat_2_12_len); -} - -DEFINE_Q35_MACHINE(2, 12); --=20 2.53.0 From nobody Sat Apr 11 21:30:07 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1772708092; cv=none; d=zohomail.com; s=zohoarc; b=KTESGP4GFiAU9MZUkpigIUyNXo8dh6odX4qXiXtx2Po/srj/j5glUq+uwdgTtTRLjEL5DXmx8KSnEPvHqgFcVi3tDyc7ma08qoUK1bkR5FE1/FxZ1UALhxlE7cJkzTH/CRxwpQG3jHhP8wRCHi5n42jLHlgu/WVKigRDyf6u8Os= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772708092; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=0KmaYFiYQC/FbwjQZgLo7Kp9Py5YNlU0oyQJ7CofGvw=; b=YCcclgnWe0m6t4gQUwF71ig/p0LorcvlVIOknvf+iWk3a6EoFx1XGBL6jBdr7aoYgCr8BOZppp4+KfBUYGgzA0dV1UIGaAWECj/XeLQZlClf3jxxxOOqImaBKBqhicNvG8V3Z6TN/mpYBppk9EbUHOIYsRbF7pJc0clJ/ZMH2Uo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772708092606714.4700594231276; Thu, 5 Mar 2026 02:54:52 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vy6Kn-0003BV-SW; Thu, 05 Mar 2026 05:53:38 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vy6Kk-00031D-Tv for qemu-devel@nongnu.org; Thu, 05 Mar 2026 05:53:34 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vy6Kj-0005c3-I8 for qemu-devel@nongnu.org; Thu, 05 Mar 2026 05:53:34 -0500 Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-389-dSCVu9i2M8eCJhHaf1oP8A-1; Thu, 05 Mar 2026 05:53:31 -0500 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 9812E1800618; Thu, 5 Mar 2026 10:53:30 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.45.224.75]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 27E043003E98; Thu, 5 Mar 2026 10:53:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1772708012; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0KmaYFiYQC/FbwjQZgLo7Kp9Py5YNlU0oyQJ7CofGvw=; b=I9TYtr3F3Ck8Etf9KBvagJL9SjwCmgMky9DOrlNZFBOVslaoC8Mj2HXF4tLN/ELMjivnti 7GMjoff+p+f7GAebOE0xD6uHSbi3vZJlZsb4yfXAavFrDrlZUtdDBS55vQ+2mZvwTRZAL+ 0VZHzr2Btcwc/yWa5NgxcOwOdBPQs8M= X-MC-Unique: dSCVu9i2M8eCJhHaf1oP8A-1 X-Mimecast-MFC-AGG-ID: dSCVu9i2M8eCJhHaf1oP8A_1772708010 From: Thomas Huth To: Peter Maydell Cc: qemu-devel@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Xiaoyao Li Subject: [PULL 22/28] hw/i386/pc: Remove pc_compat_2_12[] array Date: Thu, 5 Mar 2026 11:52:09 +0100 Message-ID: <20260305105215.302571-23-thuth@redhat.com> In-Reply-To: <20260305105215.302571-1-thuth@redhat.com> References: <20260305105215.302571-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 0 X-Spam_score: -0.0 X-Spam_bar: / X-Spam_report: (-0.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.703, RCVD_IN_VALIDITY_SAFE_BLOCKED=1.386, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1772708093192158500 From: Philippe Mathieu-Daud=C3=A9 The pc_compat_2_12[] array was only used by the pc-q35-2.12 and pc-i440fx-2.12 machines, which got removed. Remove it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20250501223522.99772-9-philmd@linaro.org> Reviewed-by: Thomas Huth Reviewed-by: Xiaoyao Li Signed-off-by: Thomas Huth --- include/hw/i386/pc.h | 3 --- hw/i386/pc.c | 8 -------- 2 files changed, 11 deletions(-) diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index a3b270ccc97..113813c07d7 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -280,9 +280,6 @@ extern const size_t pc_compat_3_1_len; extern GlobalProperty pc_compat_3_0[]; extern const size_t pc_compat_3_0_len; =20 -extern GlobalProperty pc_compat_2_12[]; -extern const size_t pc_compat_2_12_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 6427c62dbcd..819e729a6e3 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -221,14 +221,6 @@ GlobalProperty pc_compat_3_0[] =3D { }; const size_t pc_compat_3_0_len =3D G_N_ELEMENTS(pc_compat_3_0); =20 -GlobalProperty pc_compat_2_12[] =3D { - { TYPE_X86_CPU, "legacy-cache", "on" }, - { TYPE_X86_CPU, "topoext", "off" }, - { "EPYC-" TYPE_X86_CPU, "xlevel", "0x8000000a" }, - { "EPYC-IBPB-" TYPE_X86_CPU, "xlevel", "0x8000000a" }, -}; -const size_t pc_compat_2_12_len =3D G_N_ELEMENTS(pc_compat_2_12); - /* * @PC_FW_DATA: * Size of the chunk of memory at the top of RAM for the BIOS ACPI tables --=20 2.53.0 From nobody Sat Apr 11 21:30:07 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1772708073; cv=none; d=zohomail.com; s=zohoarc; b=dBOmzRO8mbVqpTZOsEGDWZBaN8QzMJWHYsWOVK7npHcRxiXm9CwvixCxWnBtVYyYWGna6hJyOktmAxLYg4p50v8DSioCFYBxOMi84Pt8njV57alagmfw52Hm9laysue4dN0BBKYhBQTHJkYE+7S3Bd9sQBIKqHIXQqattLABGfg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772708073; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=4rWNF2GnBbJFz5b8A/XXAwMPqvS93oh2FrPm2RUPIRU=; b=SOjsCihPtispNPV0qweuMVPMfXJF6HiyF56mbxm4pOiXU1EsLNWT+tJIxbK2TL6KZhEOAHr2IcACGIv7qMUK9gFgjG5dRjZ7Fd6/CLRArpicx9HrI3GGMRiww0Xz1OVa11Fj4NNnq1c6BGmFgGvj/NIu7DIrFBbIcLD0SEX/VSk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 17727080738384.351964416497367; Thu, 5 Mar 2026 02:54:33 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vy6Kr-0003OD-Mk; Thu, 05 Mar 2026 05:53:41 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vy6Ko-0003CN-LS for qemu-devel@nongnu.org; Thu, 05 Mar 2026 05:53:38 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vy6Km-0005dc-KK for qemu-devel@nongnu.org; Thu, 05 Mar 2026 05:53:37 -0500 Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-547-wGDZX2BQOByzecGZNpZwDw-1; Thu, 05 Mar 2026 05:53:34 -0500 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 8F8781800464; Thu, 5 Mar 2026 10:53:33 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.45.224.75]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 3AF993003E98; Thu, 5 Mar 2026 10:53:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1772708016; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4rWNF2GnBbJFz5b8A/XXAwMPqvS93oh2FrPm2RUPIRU=; b=G//dgn1ynLwu/NiC5TRPVR4DHUfjDGJnJ8pZ6FlBc+DtWT3JlQ6HsY/OPKTx6IbBw8Vckq WUH3oEgpp4Vc2/qs8ef0g4DBDE1PNOK6MhyHGQx4HzfXoFiEhSlI/WlHU+YKAuUktIvqq4 qqQVIDBw/sNljPlm1eWsP1tPNDDR/NU= X-MC-Unique: wGDZX2BQOByzecGZNpZwDw-1 X-Mimecast-MFC-AGG-ID: wGDZX2BQOByzecGZNpZwDw_1772708013 From: Thomas Huth To: Peter Maydell Cc: qemu-devel@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 23/28] hw/core/machine: Remove hw_compat_2_10[] array Date: Thu, 5 Mar 2026 11:52:10 +0100 Message-ID: <20260305105215.302571-24-thuth@redhat.com> In-Reply-To: <20260305105215.302571-1-thuth@redhat.com> References: <20260305105215.302571-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 0 X-Spam_score: -0.0 X-Spam_bar: / X-Spam_report: (-0.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.703, RCVD_IN_VALIDITY_SAFE_BLOCKED=1.386, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1772708075118158500 From: Philippe Mathieu-Daud=C3=A9 The hw_compat_2_10[] array was only used by the pc-q35-2.10, pc-i440fx-2.10 and s390-ccw-virtio-2.10 machines, which got removed. Remove it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20250501230129.2596-3-philmd@linaro.org> Reviewed-by: Thomas Huth Signed-off-by: Thomas Huth --- include/hw/core/boards.h | 3 --- hw/core/machine.c | 6 ------ 2 files changed, 9 deletions(-) diff --git a/include/hw/core/boards.h b/include/hw/core/boards.h index bc3193ecbd3..54988ecbcfb 100644 --- a/include/hw/core/boards.h +++ b/include/hw/core/boards.h @@ -880,7 +880,4 @@ extern const size_t hw_compat_2_12_len; extern GlobalProperty hw_compat_2_11[]; extern const size_t hw_compat_2_11_len; =20 -extern GlobalProperty hw_compat_2_10[]; -extern const size_t hw_compat_2_10_len; - #endif diff --git a/hw/core/machine.c b/hw/core/machine.c index b47bb411b64..285adf1e07d 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -258,12 +258,6 @@ GlobalProperty hw_compat_2_11[] =3D { }; const size_t hw_compat_2_11_len =3D G_N_ELEMENTS(hw_compat_2_11); =20 -GlobalProperty hw_compat_2_10[] =3D { - { "virtio-mouse-device", "wheel-axis", "false" }, - { "virtio-tablet-device", "wheel-axis", "false" }, -}; -const size_t hw_compat_2_10_len =3D G_N_ELEMENTS(hw_compat_2_10); - MachineState *current_machine; =20 static char *machine_get_kernel(Object *obj, Error **errp) --=20 2.53.0 From nobody Sat Apr 11 21:30:07 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1772708069; cv=none; d=zohomail.com; s=zohoarc; b=G2u/8ChwVXpM0/CmKdKRke3oZhsgAaFSUsE4p0OwYSZyScpt8Vj6W4b94fpDfJs0gZKX1vO7NE7Hr28ei59G4nzB4mMOLds3+bVzALpC4If6z6v0xGaqtAO/mpHlG4bgbVlcUt0HloijTQfdxY3Zc65oJ2f9bAJHlOijoszCokw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772708069; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=YDtsxtTpETlFmjyggCTqKy4glvqXLb0PRcKFCo8tsRA=; b=FaEMSenDBSOiOG+uhgwbbmL4KzMun0zIQakJihABCxY31y9Y7m1Dd3GWfXhW6J4BrElovBjwA69jqKrBY8eZP8Wr5hMzI2Z9cTrEJ/ae+2Abl9NMVD9L0sJCUOYgSXeEKwU6kIvvxCNiamhQ/k66fXdfWhCJlJ2N84IcMRhGCVk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772708069558230.84285278253788; Thu, 5 Mar 2026 02:54:29 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vy6Kv-0003sC-Nd; Thu, 05 Mar 2026 05:53:45 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vy6Kt-0003c5-NH for qemu-devel@nongnu.org; Thu, 05 Mar 2026 05:53:43 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vy6Kr-0005hd-RW for qemu-devel@nongnu.org; Thu, 05 Mar 2026 05:53:43 -0500 Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-39-8gwNAHW1NamWuDc0bvBNOA-1; Thu, 05 Mar 2026 05:53:36 -0500 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id D71A0180034F; Thu, 5 Mar 2026 10:53:35 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.45.224.75]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 13C873003E98; Thu, 5 Mar 2026 10:53:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1772708021; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=YDtsxtTpETlFmjyggCTqKy4glvqXLb0PRcKFCo8tsRA=; b=Z+aU+MEJ1GnRWd4QUu5yl8aw+JxBrPVGbYKlgtcvStyYXmpWZwVtIom9T2dBkr9m/ywqZS zSlhS6jpwA1ybVGeVKaaUt9/gm1uzkjruB1bCGqSJNArBFirC1zJbEAafDjujiVKtDfQTq zevEYmfkY2kOnmrrYG/A52GNWN4kwig= X-MC-Unique: 8gwNAHW1NamWuDc0bvBNOA-1 X-Mimecast-MFC-AGG-ID: 8gwNAHW1NamWuDc0bvBNOA_1772708016 From: Thomas Huth To: Peter Maydell Cc: qemu-devel@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 24/28] hw/input/virtio-input: Remove VirtIOInputHID::wheel_axis field Date: Thu, 5 Mar 2026 11:52:11 +0100 Message-ID: <20260305105215.302571-25-thuth@redhat.com> In-Reply-To: <20260305105215.302571-1-thuth@redhat.com> References: <20260305105215.302571-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 0 X-Spam_score: -0.0 X-Spam_bar: / X-Spam_report: (-0.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.703, RCVD_IN_VALIDITY_SAFE_BLOCKED=1.386, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1772708070797154100 From: Philippe Mathieu-Daud=C3=A9 The VirtIOInputHID::wheel_axis boolean was only set in the hw_compat_2_10[] array, via the 'wheel-axis=3Dfalse' property. We removed all machines using that array, lets remove that property and all the code around it. There is only one virtio_input_config[] version for each device, rename it removing the '_v2' suffix. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20250501230129.2596-4-philmd@linaro.org> Reviewed-by: Thomas Huth Signed-off-by: Thomas Huth --- include/hw/virtio/virtio-input.h | 1 - hw/input/virtio-input-hid.c | 102 ++----------------------------- 2 files changed, 5 insertions(+), 98 deletions(-) diff --git a/include/hw/virtio/virtio-input.h b/include/hw/virtio/virtio-in= put.h index e097b0b5217..1e94f8a03db 100644 --- a/include/hw/virtio/virtio-input.h +++ b/include/hw/virtio/virtio-input.h @@ -89,7 +89,6 @@ struct VirtIOInputHID { const QemuInputHandler *handler; QemuInputHandlerState *hs; int ledstate; - bool wheel_axis; }; =20 struct VirtIOInputHost { diff --git a/hw/input/virtio-input-hid.c b/hw/input/virtio-input-hid.c index bcbfef0b905..14dde90a48b 100644 --- a/hw/input/virtio-input-hid.c +++ b/hw/input/virtio-input-hid.c @@ -81,7 +81,6 @@ static void virtio_input_extend_config(VirtIOInput *vinpu= t, static void virtio_input_handle_event(DeviceState *dev, QemuConsole *src, InputEvent *evt) { - VirtIOInputHID *vhid =3D VIRTIO_INPUT_HID(dev); VirtIOInput *vinput =3D VIRTIO_INPUT(dev); virtio_input_event event; int qcode; @@ -109,8 +108,7 @@ static void virtio_input_handle_event(DeviceState *dev,= QemuConsole *src, break; case INPUT_EVENT_KIND_BTN: btn =3D evt->u.btn.data; - if (vhid->wheel_axis && - (btn->button =3D=3D INPUT_BUTTON_WHEEL_UP || + if ((btn->button =3D=3D INPUT_BUTTON_WHEEL_UP || btn->button =3D=3D INPUT_BUTTON_WHEEL_DOWN) && btn->down) { event.type =3D cpu_to_le16(EV_REL); @@ -328,32 +326,7 @@ static const QemuInputHandler virtio_mouse_handler =3D= { .sync =3D virtio_input_handle_sync, }; =20 -static struct virtio_input_config virtio_mouse_config_v1[] =3D { - { - .select =3D VIRTIO_INPUT_CFG_ID_NAME, - .size =3D sizeof(VIRTIO_ID_NAME_MOUSE), - .u.string =3D VIRTIO_ID_NAME_MOUSE, - },{ - .select =3D VIRTIO_INPUT_CFG_ID_DEVIDS, - .size =3D sizeof(struct virtio_input_devids), - .u.ids =3D { - .bustype =3D const_le16(BUS_VIRTUAL), - .vendor =3D const_le16(0x0627), /* same we use for usb hid de= vices */ - .product =3D const_le16(0x0002), - .version =3D const_le16(0x0001), - }, - },{ - .select =3D VIRTIO_INPUT_CFG_EV_BITS, - .subsel =3D EV_REL, - .size =3D 1, - .u.bitmap =3D { - (1 << REL_X) | (1 << REL_Y), - }, - }, - { /* end of list */ }, -}; - -static struct virtio_input_config virtio_mouse_config_v2[] =3D { +static struct virtio_input_config virtio_mouse_config[] =3D { { .select =3D VIRTIO_INPUT_CFG_ID_NAME, .size =3D sizeof(VIRTIO_ID_NAME_MOUSE), @@ -379,26 +352,13 @@ static struct virtio_input_config virtio_mouse_config= _v2[] =3D { { /* end of list */ }, }; =20 -static const Property virtio_mouse_properties[] =3D { - DEFINE_PROP_BOOL("wheel-axis", VirtIOInputHID, wheel_axis, true), -}; - -static void virtio_mouse_class_init(ObjectClass *klass, const void *data) -{ - DeviceClass *dc =3D DEVICE_CLASS(klass); - - device_class_set_props(dc, virtio_mouse_properties); -} - static void virtio_mouse_init(Object *obj) { VirtIOInputHID *vhid =3D VIRTIO_INPUT_HID(obj); VirtIOInput *vinput =3D VIRTIO_INPUT(obj); =20 vhid->handler =3D &virtio_mouse_handler; - virtio_input_init_config(vinput, vhid->wheel_axis - ? virtio_mouse_config_v2 - : virtio_mouse_config_v1); + virtio_input_init_config(vinput, virtio_mouse_config); virtio_input_extend_config(vinput, keymap_button, ARRAY_SIZE(keymap_button), VIRTIO_INPUT_CFG_EV_BITS, EV_KEY); @@ -409,7 +369,6 @@ static const TypeInfo virtio_mouse_info =3D { .parent =3D TYPE_VIRTIO_INPUT_HID, .instance_size =3D sizeof(VirtIOInputHID), .instance_init =3D virtio_mouse_init, - .class_init =3D virtio_mouse_class_init, }; =20 /* ----------------------------------------------------------------- */ @@ -421,44 +380,7 @@ static const QemuInputHandler virtio_tablet_handler = =3D { .sync =3D virtio_input_handle_sync, }; =20 -static struct virtio_input_config virtio_tablet_config_v1[] =3D { - { - .select =3D VIRTIO_INPUT_CFG_ID_NAME, - .size =3D sizeof(VIRTIO_ID_NAME_TABLET), - .u.string =3D VIRTIO_ID_NAME_TABLET, - },{ - .select =3D VIRTIO_INPUT_CFG_ID_DEVIDS, - .size =3D sizeof(struct virtio_input_devids), - .u.ids =3D { - .bustype =3D const_le16(BUS_VIRTUAL), - .vendor =3D const_le16(0x0627), /* same we use for usb hid de= vices */ - .product =3D const_le16(0x0003), - .version =3D const_le16(0x0001), - }, - },{ - .select =3D VIRTIO_INPUT_CFG_EV_BITS, - .subsel =3D EV_ABS, - .size =3D 1, - .u.bitmap =3D { - (1 << ABS_X) | (1 << ABS_Y), - }, - },{ - .select =3D VIRTIO_INPUT_CFG_ABS_INFO, - .subsel =3D ABS_X, - .size =3D sizeof(virtio_input_absinfo), - .u.abs.min =3D const_le32(INPUT_EVENT_ABS_MIN), - .u.abs.max =3D const_le32(INPUT_EVENT_ABS_MAX), - },{ - .select =3D VIRTIO_INPUT_CFG_ABS_INFO, - .subsel =3D ABS_Y, - .size =3D sizeof(virtio_input_absinfo), - .u.abs.min =3D const_le32(INPUT_EVENT_ABS_MIN), - .u.abs.max =3D const_le32(INPUT_EVENT_ABS_MAX), - }, - { /* end of list */ }, -}; - -static struct virtio_input_config virtio_tablet_config_v2[] =3D { +static struct virtio_input_config virtio_tablet_config[] =3D { { .select =3D VIRTIO_INPUT_CFG_ID_NAME, .size =3D sizeof(VIRTIO_ID_NAME_TABLET), @@ -503,26 +425,13 @@ static struct virtio_input_config virtio_tablet_confi= g_v2[] =3D { { /* end of list */ }, }; =20 -static const Property virtio_tablet_properties[] =3D { - DEFINE_PROP_BOOL("wheel-axis", VirtIOInputHID, wheel_axis, true), -}; - -static void virtio_tablet_class_init(ObjectClass *klass, const void *data) -{ - DeviceClass *dc =3D DEVICE_CLASS(klass); - - device_class_set_props(dc, virtio_tablet_properties); -} - static void virtio_tablet_init(Object *obj) { VirtIOInputHID *vhid =3D VIRTIO_INPUT_HID(obj); VirtIOInput *vinput =3D VIRTIO_INPUT(obj); =20 vhid->handler =3D &virtio_tablet_handler; - virtio_input_init_config(vinput, vhid->wheel_axis - ? virtio_tablet_config_v2 - : virtio_tablet_config_v1); + virtio_input_init_config(vinput, virtio_tablet_config); virtio_input_extend_config(vinput, keymap_button, ARRAY_SIZE(keymap_button), VIRTIO_INPUT_CFG_EV_BITS, EV_KEY); @@ -533,7 +442,6 @@ static const TypeInfo virtio_tablet_info =3D { .parent =3D TYPE_VIRTIO_INPUT_HID, .instance_size =3D sizeof(VirtIOInputHID), .instance_init =3D virtio_tablet_init, - .class_init =3D virtio_tablet_class_init, }; =20 /* ----------------------------------------------------------------- */ --=20 2.53.0 From nobody Sat Apr 11 21:30:08 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1772708146; cv=none; d=zohomail.com; s=zohoarc; b=YrktB0vOvsBHzszmCHRs748+Kgr+24ak753kBtBO68Mndwstv3AVsUQ2y+S8KH+aRMk4InHXL4LtfFqWUKD3eHt2OHtxKp1cr6ion4Wf/91YIO8WaAF5VKA95LBekBggEbIrvM1+u+gVZKakyV7d8oy70KLgyUzlAS2GmmrDQkY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772708146; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=RhHUyKvu5fylUBKCcwjEcF9V9TxeOm8kTaIv18u5oII=; b=ikdALnGNiXR8BNjOP3TYzE2A3FpDEWcadnXzl4b9j+lPFKDuI+lDl9C9VHinWtr05AN5FXozveknpKw+iwC3oAGeo9FxgJ85OcfHnIrWXYOQtkcJeLK/Xfc2DuMztAaEnwk1cWU3lj2WGLn5kczGRFT9ZReJj1SSbtyDH2Cfp9M= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772708146223874.9247176737288; Thu, 5 Mar 2026 02:55:46 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vy6Kx-00045U-9v; Thu, 05 Mar 2026 05:53:47 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vy6Kv-0003o3-5v for qemu-devel@nongnu.org; Thu, 05 Mar 2026 05:53:45 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vy6Kt-0005j3-Mg for qemu-devel@nongnu.org; Thu, 05 Mar 2026 05:53:44 -0500 Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-151-Mvoh-spqOLKkdGLEvilBxg-1; Thu, 05 Mar 2026 05:53:39 -0500 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id E54AD19560A5; Thu, 5 Mar 2026 10:53:38 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.45.224.75]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id D2FDE3003E98; Thu, 5 Mar 2026 10:53:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1772708022; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=RhHUyKvu5fylUBKCcwjEcF9V9TxeOm8kTaIv18u5oII=; b=Ncz5dPUxUgalHFHYARfWcY+vEBktvn4XY8oeVqZvl14nXWK6IieOdRpfrINSPWahENzGMk osqWE7UkSJ1IoGhLT8+pAV+tFkaxOuG2AO8kIh/ulAusqo3N56hQqgxKLwesg/dslBQnFP xGbPzzK/lmoWg+axd4ULAIY7I7ZPrMs= X-MC-Unique: Mvoh-spqOLKkdGLEvilBxg-1 X-Mimecast-MFC-AGG-ID: Mvoh-spqOLKkdGLEvilBxg_1772708019 From: Thomas Huth To: Peter Maydell Cc: qemu-devel@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 25/28] hw/core/machine: Remove hw_compat_2_11[] array Date: Thu, 5 Mar 2026 11:52:12 +0100 Message-ID: <20260305105215.302571-26-thuth@redhat.com> In-Reply-To: <20260305105215.302571-1-thuth@redhat.com> References: <20260305105215.302571-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 33 X-Spam_score: 3.3 X-Spam_bar: +++ X-Spam_report: (3.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.703, RCVD_IN_VALIDITY_SAFE_BLOCKED=1.386, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1772708147799154100 From: Philippe Mathieu-Daud=C3=A9 The hw_compat_2_11[] array was only used by the pc-q35-2.11, pc-i440fx-2.11 and s390-ccw-virtio-2.11 machines, which got removed. Remove it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20250501230129.2596-5-philmd@linaro.org> Reviewed-by: Thomas Huth Signed-off-by: Thomas Huth --- include/hw/core/boards.h | 3 --- hw/core/machine.c | 8 -------- 2 files changed, 11 deletions(-) diff --git a/include/hw/core/boards.h b/include/hw/core/boards.h index 54988ecbcfb..30a55b61f6d 100644 --- a/include/hw/core/boards.h +++ b/include/hw/core/boards.h @@ -877,7 +877,4 @@ extern const size_t hw_compat_3_0_len; extern GlobalProperty hw_compat_2_12[]; extern const size_t hw_compat_2_12_len; =20 -extern GlobalProperty hw_compat_2_11[]; -extern const size_t hw_compat_2_11_len; - #endif diff --git a/hw/core/machine.c b/hw/core/machine.c index 285adf1e07d..3e10aec07e1 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -250,14 +250,6 @@ GlobalProperty hw_compat_2_12[] =3D { }; const size_t hw_compat_2_12_len =3D G_N_ELEMENTS(hw_compat_2_12); =20 -GlobalProperty hw_compat_2_11[] =3D { - { "hpet", "hpet-offset-saved", "false" }, - { "virtio-blk-pci", "vectors", "2" }, - { "vhost-user-blk-pci", "vectors", "2" }, - { "e1000", "migrate_tso_props", "off" }, -}; -const size_t hw_compat_2_11_len =3D G_N_ELEMENTS(hw_compat_2_11); - MachineState *current_machine; =20 static char *machine_get_kernel(Object *obj, Error **errp) --=20 2.53.0 From nobody Sat Apr 11 21:30:08 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1772708062; cv=none; d=zohomail.com; s=zohoarc; b=fA9npNqPZvHUvNc3c7Nn/57ivUm4cAnCPTOzklst22eQ9vYxSYyjSrobe9Xb6SYU1xGXE9AZ7QyeYR3Ndbr785yHd+djbclmzzoMfngljnzf7TlNXy8Ack/jA2QVaLJb+6LkdNuxPCjWAXSa0/HkrAgk0kx+E8eZzfIvleiCgv8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772708062; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=OmXwRo5TDMs9ijAUXPxa+zkoBvxxStM6heY/dQTkUB8=; b=hHXBPORC2kdCsYUXEm4hkw1lEM3IjGCkqIThmlEQi4DukhuzSmngVTofxW/pa82//CHJhT5aqTXOXlvo68ts4I/OfQijOMF+89m0yMIoxVobPJOOr+QlUS65P+9HXhBxx4jK+hiVREHEnfxJt4wrIQpXWHrLOBbH9bnM11YPOec= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772708062068561.101075620069; Thu, 5 Mar 2026 02:54:22 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vy6Kz-0004Ol-Tg; Thu, 05 Mar 2026 05:53:49 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vy6Ky-0004FG-IP for qemu-devel@nongnu.org; Thu, 05 Mar 2026 05:53:48 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vy6Kx-0005ks-45 for qemu-devel@nongnu.org; Thu, 05 Mar 2026 05:53:48 -0500 Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-589-Kb-ZcRW8O-e4eZHYyr8ALg-1; Thu, 05 Mar 2026 05:53:42 -0500 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id C38EE195609D; Thu, 5 Mar 2026 10:53:41 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.45.224.75]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id E5B8C3003E98; Thu, 5 Mar 2026 10:53:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1772708026; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OmXwRo5TDMs9ijAUXPxa+zkoBvxxStM6heY/dQTkUB8=; b=ftiRTYtYdgbQocjWNFhPt6eE5sw9aAdxIayXXKtJa97yblwdO9oEcKsRTYPw00rCdfPfOA uTJUWHeIt/15V7fe4kKy17W59x2YA/BdZa/maJ4UkZRwH+cQy0LRy5lZc2Kj9SCpprcd9C U19seDsQFnZWAmY57f6QFJP5W8cM5HI= X-MC-Unique: Kb-ZcRW8O-e4eZHYyr8ALg-1 X-Mimecast-MFC-AGG-ID: Kb-ZcRW8O-e4eZHYyr8ALg_1772708021 From: Thomas Huth To: Peter Maydell Cc: qemu-devel@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 26/28] hw/core/machine: Remove hw_compat_2_12[] array Date: Thu, 5 Mar 2026 11:52:13 +0100 Message-ID: <20260305105215.302571-27-thuth@redhat.com> In-Reply-To: <20260305105215.302571-1-thuth@redhat.com> References: <20260305105215.302571-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 33 X-Spam_score: 3.3 X-Spam_bar: +++ X-Spam_report: (3.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.703, RCVD_IN_VALIDITY_SAFE_BLOCKED=1.386, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1772708063042158500 From: Philippe Mathieu-Daud=C3=A9 The hw_compat_2_12[] array was only used by the pc-q35-2.12, pc-i440fx-2.12 and s390-ccw-virtio-2.12 machines, which got removed. Remove it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20250501230129.2596-9-philmd@linaro.org> Reviewed-by: Thomas Huth Signed-off-by: Thomas Huth --- include/hw/core/boards.h | 3 --- hw/core/machine.c | 9 --------- 2 files changed, 12 deletions(-) diff --git a/include/hw/core/boards.h b/include/hw/core/boards.h index 30a55b61f6d..f4ee68bbea5 100644 --- a/include/hw/core/boards.h +++ b/include/hw/core/boards.h @@ -874,7 +874,4 @@ extern const size_t hw_compat_3_1_len; extern GlobalProperty hw_compat_3_0[]; extern const size_t hw_compat_3_0_len; =20 -extern GlobalProperty hw_compat_2_12[]; -extern const size_t hw_compat_2_12_len; - #endif diff --git a/hw/core/machine.c b/hw/core/machine.c index 3e10aec07e1..4770618b559 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -241,15 +241,6 @@ const size_t hw_compat_3_1_len =3D G_N_ELEMENTS(hw_com= pat_3_1); GlobalProperty hw_compat_3_0[] =3D {}; const size_t hw_compat_3_0_len =3D G_N_ELEMENTS(hw_compat_3_0); =20 -GlobalProperty hw_compat_2_12[] =3D { - { "hda-audio", "use-timer", "false" }, - { "cirrus-vga", "global-vmstate", "true" }, - { "VGA", "global-vmstate", "true" }, - { "vmware-svga", "global-vmstate", "true" }, - { "qxl-vga", "global-vmstate", "true" }, -}; -const size_t hw_compat_2_12_len =3D G_N_ELEMENTS(hw_compat_2_12); - MachineState *current_machine; =20 static char *machine_get_kernel(Object *obj, Error **errp) --=20 2.53.0 From nobody Sat Apr 11 21:30:08 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1772708090; cv=none; d=zohomail.com; s=zohoarc; b=Cf5TmPU3fNsbgiMD5JPOyA6mkTv36DxUuUSxCmzZYFHtMuXUcvKdTARhgd9hA2GeL0inuNkpWLWRsGc3MKIZ2C4usZy3vZnbl5FN5qhhTkeAiCM25ek5BsaUgx04U196NEPo3/crJpLibhrInYMkzULe+uz8RG1VfHY+qLpescI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772708090; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=WMwRFyszVHwmFHxuLsqKw06eCvsGENQbEI+Ki3As3Oo=; b=jEaTABIVv36PhzpzgoLCKKfJFNjFThwSIXkAz+fQIY+L/vTxTfj/uQGYhqJC3vzIcgrOxnITW4oojj374PLJTLfVESUmHAGUnSVNW71JMaJui5otsSC6u1gsEtEkfvgBgzw8+sIH6+BVAjZhWU9aTlXXz2Xrhs32E8EITKK8BYc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772708090296537.8872717831439; Thu, 5 Mar 2026 02:54:50 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vy6L3-0004eE-B4; Thu, 05 Mar 2026 05:53:53 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vy6L0-0004Sf-Ir for qemu-devel@nongnu.org; Thu, 05 Mar 2026 05:53:50 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vy6Ky-0005l1-QD for qemu-devel@nongnu.org; Thu, 05 Mar 2026 05:53:50 -0500 Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-329-H8KRixL6N8SMxSY9T8_Ufg-1; Thu, 05 Mar 2026 05:53:46 -0500 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 545381955DE2; Thu, 5 Mar 2026 10:53:45 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.45.224.75]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id B9D5D3003E98; Thu, 5 Mar 2026 10:53:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1772708028; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=WMwRFyszVHwmFHxuLsqKw06eCvsGENQbEI+Ki3As3Oo=; b=bXjQOhXLVOeu0TCOzJL65rB3akqKb5z1KBWdBMQsuCf98F5WRAjrlLOB8SNRMLwd3hKVX0 4GHxQ9IIIZyhN5I9+V8oPHpaMEaprtTWHUnc3Pgvv/iAA4Q++r8QESbix0AohdHA8NtjXZ dOrh3JlsKQ8sKEdrzzbGLHktB/Refdk= X-MC-Unique: H8KRixL6N8SMxSY9T8_Ufg-1 X-Mimecast-MFC-AGG-ID: H8KRixL6N8SMxSY9T8_Ufg_1772708025 From: Thomas Huth To: Peter Maydell Cc: qemu-devel@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 27/28] hw/audio/hda-codec: Remove HDAAudioState::use_timer field Date: Thu, 5 Mar 2026 11:52:14 +0100 Message-ID: <20260305105215.302571-28-thuth@redhat.com> In-Reply-To: <20260305105215.302571-1-thuth@redhat.com> References: <20260305105215.302571-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 33 X-Spam_score: 3.3 X-Spam_bar: +++ X-Spam_report: (3.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.703, RCVD_IN_VALIDITY_SAFE_BLOCKED=1.386, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1772708091280158500 From: Philippe Mathieu-Daud=C3=A9 The HDAAudioState::use_timer boolean was only set in the hw_compat_2_12[] array, via the 'use-timer=3Dfalse' property. We removed all machines using that array, lets remove that property and all the code around it, like the compatibility callbacks. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20250501230129.2596-10-philmd@linaro.org> Reviewed-by: Thomas Huth [thuth: Rebased the patch to current master branch, fixed conflicts] Signed-off-by: Thomas Huth --- hw/audio/hda-codec.c | 93 +++++++------------------------------------- 1 file changed, 13 insertions(+), 80 deletions(-) diff --git a/hw/audio/hda-codec.c b/hw/audio/hda-codec.c index 984029a8db1..173fe56bea3 100644 --- a/hw/audio/hda-codec.c +++ b/hw/audio/hda-codec.c @@ -187,7 +187,6 @@ struct HDAAudioState { /* properties */ uint32_t debug; bool mixer; - bool use_timer; }; =20 static inline uint32_t hda_bytes_per_second(HDAAudioStream *st) @@ -368,60 +367,6 @@ static void hda_audio_output_cb(void *opaque, int avai= l) hda_timer_sync_adjust(st, (wpos - rpos) - (B_SIZE >> 1)); } =20 -static void hda_audio_compat_input_cb(void *opaque, int avail) -{ - HDAAudioStream *st =3D opaque; - int recv =3D 0; - int len; - bool rc; - - while (avail - recv >=3D sizeof(st->compat_buf)) { - if (st->compat_bpos !=3D sizeof(st->compat_buf)) { - len =3D audio_be_read(st->state->audio_be, st->voice.in, - st->compat_buf + st->compat_bpos, - sizeof(st->compat_buf) - st->compat_bpos); - st->compat_bpos +=3D len; - recv +=3D len; - if (st->compat_bpos !=3D sizeof(st->compat_buf)) { - break; - } - } - rc =3D hda_codec_xfer(&st->state->hda, st->stream, false, - st->compat_buf, sizeof(st->compat_buf)); - if (!rc) { - break; - } - st->compat_bpos =3D 0; - } -} - -static void hda_audio_compat_output_cb(void *opaque, int avail) -{ - HDAAudioStream *st =3D opaque; - int sent =3D 0; - int len; - bool rc; - - while (avail - sent >=3D sizeof(st->compat_buf)) { - if (st->compat_bpos =3D=3D sizeof(st->compat_buf)) { - rc =3D hda_codec_xfer(&st->state->hda, st->stream, true, - st->compat_buf, sizeof(st->compat_buf)); - if (!rc) { - break; - } - st->compat_bpos =3D 0; - } - len =3D audio_be_write(st->state->audio_be, st->voice.out, - st->compat_buf + st->compat_bpos, - sizeof(st->compat_buf) - st->compat_bpos); - st->compat_bpos +=3D len; - sent +=3D len; - if (st->compat_bpos !=3D sizeof(st->compat_buf)) { - break; - } - } -} - static void hda_audio_set_running(HDAAudioStream *st, bool running) { if (st->node =3D=3D NULL) { @@ -432,16 +377,14 @@ static void hda_audio_set_running(HDAAudioStream *st,= bool running) } st->running =3D running; trace_hda_audio_running(st->node->name, st->stream, st->running); - if (st->state->use_timer) { - if (running) { - int64_t now =3D qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL); - st->rpos =3D 0; - st->wpos =3D 0; - st->buft_start =3D now; - timer_mod_anticipate_ns(st->buft, now + HDA_TIMER_TICKS); - } else { - timer_del(st->buft); - } + if (running) { + int64_t now =3D qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL); + st->rpos =3D 0; + st->wpos =3D 0; + st->buft_start =3D now; + timer_mod_anticipate_ns(st->buft, now + HDA_TIMER_TICKS); + } else { + timer_del(st->buft); } if (st->output) { audio_be_set_active_out(st->state->audio_be, st->voice.out, st->ru= nning); @@ -480,7 +423,6 @@ static void hda_audio_set_amp(HDAAudioStream *st) =20 static void hda_audio_setup(HDAAudioStream *st) { - bool use_timer =3D st->state->use_timer; audio_callback_fn cb; =20 if (st->node =3D=3D NULL) { @@ -491,21 +433,13 @@ static void hda_audio_setup(HDAAudioStream *st) fmt2name[st->as.fmt], st->as.freq); =20 if (st->output) { - if (use_timer) { - cb =3D hda_audio_output_cb; - timer_del(st->buft); - } else { - cb =3D hda_audio_compat_output_cb; - } + cb =3D hda_audio_output_cb; + timer_del(st->buft); st->voice.out =3D audio_be_open_out(st->state->audio_be, st->voice= .out, st->node->name, st, cb, &st->as); } else { - if (use_timer) { - cb =3D hda_audio_input_cb; - timer_del(st->buft); - } else { - cb =3D hda_audio_compat_input_cb; - } + cb =3D hda_audio_input_cb; + timer_del(st->buft); st->voice.in =3D audio_be_open_in(st->state->audio_be, st->voice.i= n, st->node->name, st, cb, &st->as); } @@ -810,7 +744,7 @@ static void hda_audio_reset(DeviceState *dev) static bool vmstate_hda_audio_stream_buf_needed(void *opaque) { HDAAudioStream *st =3D opaque; - return st->state && st->state->use_timer; + return st->state; } =20 static const VMStateDescription vmstate_hda_audio_stream_buf =3D { @@ -866,7 +800,6 @@ static const Property hda_audio_properties[] =3D { DEFINE_AUDIO_PROPERTIES(HDAAudioState, audio_be), DEFINE_PROP_UINT32("debug", HDAAudioState, debug, 0), DEFINE_PROP_BOOL("mixer", HDAAudioState, mixer, true), - DEFINE_PROP_BOOL("use-timer", HDAAudioState, use_timer, true), }; =20 static void hda_audio_init_output(HDACodecDevice *hda, Error **errp) --=20 2.53.0 From nobody Sat Apr 11 21:30:08 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1772708053; cv=none; d=zohomail.com; s=zohoarc; b=SaY4st+WEEWoseVyB2R+h68IR/FJMwmioZq5i6AdZ8CK1Ao1AiHq50hNz/fGsABK9CpWSF8lmqitv5gXI0UqfBlobUkSExD0Hpy2oPaAc/wdltx8POXidwzEiavRCCHbZywZs+G+E3IG1pkHPs0hTGHNz645UC8sKl+FPDLHZ1E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772708053; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=HZS5GEbGChHfsF72+DUHakymxE4PqwSLiq+7AF0ynGI=; b=TWYn5BiDbooKPSXeam8ZZLWCDnx9Cq7jNPWT4TRAmOEACitsZqjusFybJSzpIOWc+6Kia/ARQ3K6vm58a4exAM6Xv9iafnn1ollJT0nt9ili+WJGKixNipiVB5560qNlLHD6WlLTPTQYZlrxJ6ckq/LA2cbaW8EWdwbqQQOhhIk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772708053417820.7730201574858; Thu, 5 Mar 2026 02:54:13 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vy6L6-0004wC-Uy; Thu, 05 Mar 2026 05:53:57 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vy6L3-0004mH-FT for qemu-devel@nongnu.org; Thu, 05 Mar 2026 05:53:53 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vy6L1-0005n7-9Z for qemu-devel@nongnu.org; Thu, 05 Mar 2026 05:53:52 -0500 Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-413-_Ii9oJJNMIuOrBalDCrl5A-1; Thu, 05 Mar 2026 05:53:49 -0500 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 2B3E6195609D; Thu, 5 Mar 2026 10:53:48 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.45.224.75]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 5A4A43003E98; Thu, 5 Mar 2026 10:53:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1772708030; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HZS5GEbGChHfsF72+DUHakymxE4PqwSLiq+7AF0ynGI=; b=DSUG+NH8QqMkwUbTShsZbqny4fmTEYSzi1tDyCpN5lMOe4fYVF8jWk38FCVPr2/bggQsGT Ra58kqjkpdY06DobAGRHWMTWdEtIBdZIdJyrFm0Vm9X7iVhDthmCUtzYNcLvmESzOthzux jC+8qsh/kAZV3OwDxX/aLsL13TJQiBs= X-MC-Unique: _Ii9oJJNMIuOrBalDCrl5A-1 X-Mimecast-MFC-AGG-ID: _Ii9oJJNMIuOrBalDCrl5A_1772708028 From: Thomas Huth To: Peter Maydell Cc: qemu-devel@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 28/28] hw/display/vga-pci: Do not expose the 'global-vmstate' property Date: Thu, 5 Mar 2026 11:52:15 +0100 Message-ID: <20260305105215.302571-29-thuth@redhat.com> In-Reply-To: <20260305105215.302571-1-thuth@redhat.com> References: <20260305105215.302571-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 33 X-Spam_score: 3.3 X-Spam_bar: +++ X-Spam_report: (3.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.703, RCVD_IN_VALIDITY_SAFE_BLOCKED=1.386, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1772708054416154100 From: Philippe Mathieu-Daud=C3=A9 The "global-vmstate" property is 'false' by default, and was only set to 'true' in the hw_compat_2_12[] array. We removed all machines using that array. Stop exposing that property on the PCI devices. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20250501230129.2596-11-philmd@linaro.org> Reviewed-by: Thomas Huth Signed-off-by: Thomas Huth --- hw/display/cirrus_vga.c | 2 -- hw/display/qxl.c | 1 - hw/display/vga-pci.c | 1 - hw/display/vmware_vga.c | 2 -- 4 files changed, 6 deletions(-) diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c index 37228ff1345..629b34fc68d 100644 --- a/hw/display/cirrus_vga.c +++ b/hw/display/cirrus_vga.c @@ -2987,8 +2987,6 @@ static const Property pci_vga_cirrus_properties[] =3D= { cirrus_vga.vga.vram_size_mb, 4), DEFINE_PROP_BOOL("blitter", struct PCICirrusVGAState, cirrus_vga.enable_blitter, true), - DEFINE_PROP_BOOL("global-vmstate", struct PCICirrusVGAState, - cirrus_vga.vga.global_vmstate, false), }; =20 static void cirrus_vga_class_init(ObjectClass *klass, const void *data) diff --git a/hw/display/qxl.c b/hw/display/qxl.c index 0551b38230b..3d4b5635568 100644 --- a/hw/display/qxl.c +++ b/hw/display/qxl.c @@ -2476,7 +2476,6 @@ static const Property qxl_properties[] =3D { DEFINE_PROP_UINT16("max_outputs", PCIQXLDevice, max_outputs, 0), DEFINE_PROP_UINT32("xres", PCIQXLDevice, xres, 0), DEFINE_PROP_UINT32("yres", PCIQXLDevice, yres, 0), - DEFINE_PROP_BOOL("global-vmstate", PCIQXLDevice, vga.global_vmstat= e, false), }; =20 static void qxl_pci_class_init(ObjectClass *klass, const void *data) diff --git a/hw/display/vga-pci.c b/hw/display/vga-pci.c index d0f9de1ab35..4e68dd57a17 100644 --- a/hw/display/vga-pci.c +++ b/hw/display/vga-pci.c @@ -338,7 +338,6 @@ static const Property vga_pci_properties[] =3D { DEFINE_PROP_BIT("edid", PCIVGAState, flags, PCI_VGA_FLAG_ENABLE_EDID, true), DEFINE_EDID_PROPERTIES(PCIVGAState, edid_info), - DEFINE_PROP_BOOL("global-vmstate", PCIVGAState, vga.global_vmstate, fa= lse), }; =20 static const Property secondary_pci_properties[] =3D { diff --git a/hw/display/vmware_vga.c b/hw/display/vmware_vga.c index ea7a9fca04e..c2c6bc76e90 100644 --- a/hw/display/vmware_vga.c +++ b/hw/display/vmware_vga.c @@ -1335,8 +1335,6 @@ static void pci_vmsvga_realize(PCIDevice *dev, Error = **errp) static const Property vga_vmware_properties[] =3D { DEFINE_PROP_UINT32("vgamem_mb", struct pci_vmsvga_state_s, chip.vga.vram_size_mb, 16), - DEFINE_PROP_BOOL("global-vmstate", struct pci_vmsvga_state_s, - chip.vga.global_vmstate, false), }; =20 static void vmsvga_class_init(ObjectClass *klass, const void *data) --=20 2.53.0