From nobody Mon Apr 13 10:53:36 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=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1772897235; cv=none; d=zohomail.com; s=zohoarc; b=Z8jFvYWBTenqu1AeAelNMyWQLCYMG0Vt3qDElXUcU7Iub0BNDGNylhQ3UUjd/b3sLBWn0BxWE9EXky6oUr2ZKmM5SV4Idi2jHCmi5Fr78EcP5K5uNkyoFaZNibTbcuGzEzhmjiJ01yxMbhp3e/4B+A8TL049hkmHkZLraSD/kug= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772897235; 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=lyFJMidGdKfjK3ch02S4UC88fe7pRdRHRDfb2uPU+CU=; b=ihYXda2uf1q/xwPr7535Znd2ySubHlEjhyyBWJGt0uE3qAswSCx00sYNo4mZl9eh6RQpyZ2BVagTaaFSMzkXeBGWMIMRC+BuCYKptYG+gTC71zO5POkaFLg7+oIQQ26Rx7yApgxw3RYFgPak4b/BYq8ZQcmPj5BYWOjhm0N59ew= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772897235797978.0138830214377; Sat, 7 Mar 2026 07:27:15 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vytYI-0004wb-Ha; Sat, 07 Mar 2026 10:26:50 -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 1vytYG-0004w0-SC for qemu-devel@nongnu.org; Sat, 07 Mar 2026 10:26:48 -0500 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vytYF-000849-BC for qemu-devel@nongnu.org; Sat, 07 Mar 2026 10:26:48 -0500 Received: by mail-wr1-x432.google.com with SMTP id ffacd0b85a97d-439b9b1900bso4901415f8f.1 for ; Sat, 07 Mar 2026 07:26:46 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-439dad8d95dsm12878764f8f.7.2026.03.07.07.26.43 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 07 Mar 2026 07:26:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1772897204; x=1773502004; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=lyFJMidGdKfjK3ch02S4UC88fe7pRdRHRDfb2uPU+CU=; b=spB+z3iOvDxpS5zoIbZMFO2QxPXZ8MMP7iY2iYeX9jxg3lHxBvazgIfajg5gGE1dad WRyHQtp5uvu//whVhLO+brt+ZqJW8llc9wxcHfGJuYOP5pXDOGUUhGROR5J7XRDlgnW0 LKiCrv3NPAYPxVxFmtipe4sU6EYLopPOKYR1wUX45ED/7aIID6uspjWIFvjSFBMvRp6v JQ8tiIfp1HXekRD/fBypJxaUAQ2zqeXE1NLnAEcfqgHPz/0Mi8X6UaMfDUFZJEwyo7Am uUJbKlO3yOE2wrzd3cBHuvrR2dXYxlZqB4oMEEqjs2ch5GzxS75Rf0Figwr/QweZQHJk 3qZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772897204; x=1773502004; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=lyFJMidGdKfjK3ch02S4UC88fe7pRdRHRDfb2uPU+CU=; b=ZBK30lUElb2H/yIV0nRIKZp9nalry0hsTU8D2/UlBw71z/0KCljepFEaU2Nnrpfby4 nrLVNQq4oDmlFVvMq/0VQuq9SWMMhik6VCfAcJFlzV3s3/VB84jMOOZbCARE3/Q84uwb pWHkykn67xwMPadf2RW4EtGiRQF8ab9ULHpHeBn+OpfpVeK97oqOSfux3AdDXwsBTKBM HOlWiC4T6X9rEZQV/o4VaDLKYBulD5mH1Ms6jMllMKYdY77D+uLyJvVBE3kYkhHtlK60 zs1kdWl93CR6KiY4TR5lpizbA7Y1dM4QTciN7JeqvyAzueb9E/r2l6Wwfrm7vE4uGRRs 8c3A== X-Gm-Message-State: AOJu0YxirFXFmcucXC55ciJuPYe+oPZNdstdaInp/J5FA+8n6ogEne0G WTDbx1RQsRKgY8pvrWModnZb2a+p0nBrdSMojcu0DchV5KouTs1RL34ywclAdRed+rCSSJECYdU sVtQn9mQ= X-Gm-Gg: ATEYQzxy5RW030xtvbhY+KesI0e3sTYM5eOHBusZpQRuH0QQ0UTroH+tXutdpcvTUoK pT0bvWg5yzrR/XkMaEb/HLS7Vu77MMNfl+C4XhAQfSJ0jn6H7b59qhzDADYfKJzkIvkdSIwP0WS 0LY0FO9ovrnkLtZ+3Rmq5bQr0kS2GQE5VDY3JGtvs7pXtgjQdENT/5gc5XksRAXjc5B7ELfPIr+ relYHQ8rugdqLE7UcUf9Yif4d+Pb43xoO4xryfUfSDL+vCpNaCe0Hv6D2axH+/mMbeJ21NTqskq vAuv0d2e7BhKd4Kz6ARTgP046tG2KU8HnRwjtABUTurQWuuG835Y3lIrcoW1VnRDyx2SkVVxKP5 bRJT1YtSWy+sjqdEri6LF5LetxYt5LTOltTirBK28IMls2F3I6N+KS/w/IpGnZyQFRQPSy+sMuA xfCg6m8GolWmVzRZJLqJ8kwJeAyOyHNXQiTRFxBl8tQbEyUqqKBVR/EpZ/7xA/je/+u7DbXerSY 3uhQn5TWQU= X-Received: by 2002:a05:600c:8b26:b0:480:1c85:88bf with SMTP id 5b1f17b1804b1-4852697a5c1mr92596345e9.27.1772897204430; Sat, 07 Mar 2026 07:26:44 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Yi Liu , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Zhao Liu , "Michael S. Tsirkin" , Igor Mammedov , =?UTF-8?q?Cl=C3=A9ment=20Mathieu--Drif?= , Paolo Bonzini , Stefan Berger , Ani Sinha , Thomas Huth , Marcel Apfelbaum , Richard Henderson , Eduardo Habkost Subject: [PATCH 01/10] hw/i386/pc: Remove deprecated pc-q35-3.1 and pc-i440fx-3.1 machines Date: Sat, 7 Mar 2026 16:26:25 +0100 Message-ID: <20260307152635.83893-2-philmd@linaro.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260307152635.83893-1-philmd@linaro.org> References: <20260307152635.83893-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::432; envelope-from=philmd@linaro.org; helo=mail-wr1-x432.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: 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 @linaro.org) X-ZM-MESSAGEID: 1772897238684154100 These machines has been supported for a period of more than 6 years. According to our versioned machine support policy (see commit ce80c4fa6ff "docs: document special exception for machine type deprecation & removal") they can now be removed. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth --- hw/i386/pc_piix.c | 13 ------------- hw/i386/pc_q35.c | 14 -------------- 2 files changed, 27 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 29c8e997131..13981fb3aba 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -655,19 +655,6 @@ static void pc_i440fx_machine_4_0_options(MachineClass= *m) =20 DEFINE_I440FX_MACHINE(4, 0); =20 -static void pc_i440fx_machine_3_1_options(MachineClass *m) -{ - PCMachineClass *pcmc =3D PC_MACHINE_CLASS(m); - - pc_i440fx_machine_4_0_options(m); - m->smbus_no_migration_support =3D true; - pcmc->pvh_enabled =3D false; - compat_props_add(m->compat_props, hw_compat_3_1, hw_compat_3_1_len); - compat_props_add(m->compat_props, pc_compat_3_1, pc_compat_3_1_len); -} - -DEFINE_I440FX_MACHINE(3, 1); - #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 f102da8e4a1..52b8064b4d2 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -600,17 +600,3 @@ static void pc_q35_machine_4_0_options(MachineClass *m) } =20 DEFINE_Q35_MACHINE(4, 0); - -static void pc_q35_machine_3_1_options(MachineClass *m) -{ - PCMachineClass *pcmc =3D PC_MACHINE_CLASS(m); - - pc_q35_machine_4_0_options(m); - m->default_kernel_irqchip_split =3D false; - m->smbus_no_migration_support =3D true; - pcmc->pvh_enabled =3D false; - compat_props_add(m->compat_props, hw_compat_3_1, hw_compat_3_1_len); - compat_props_add(m->compat_props, pc_compat_3_1, pc_compat_3_1_len); -} - -DEFINE_Q35_MACHINE(3, 1); --=20 2.52.0 From nobody Mon Apr 13 10:53:36 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=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1772897235; cv=none; d=zohomail.com; s=zohoarc; b=lAOGUowDoL9TMY5gAcoLP39SM8jrzHrgvEWcaK8aAa6I8KnzuQ/B1RZCadP6SR/8SQQYLfFM6q6J0aiobzwvfJSfdVB84NKnopPwzsHmr13w1uKMbzSfz1O0YMbNz9EB8eJRQcbQufPov6ZJWUq1juUwEI7inYVEtL5GWHL5pFo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772897235; 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=IMoQ3NbTol8pSbdgghPvXG4r2n1wnaW8ZAPS6V4fUYw=; b=BKyZtJ96IGkiGo7YVIVVFIBClqCMI0d3tAUED6sevbuMN2b+ZIle1gIyKwPez9aMHJXbJ1fDRy4QAjzT/pcnv2OrYI282SzGG0NxpRC9/vLaXZd6rv5OuHPl+LGFTTnfOdJwK4DwfjdhZOAWBZtoswiEeoPUyGQ1Ynvk63LVTEA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772897235893742.9587202384176; Sat, 7 Mar 2026 07:27:15 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vytYN-0004x0-Vp; Sat, 07 Mar 2026 10:26:56 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vytYM-0004wq-QY for qemu-devel@nongnu.org; Sat, 07 Mar 2026 10:26:54 -0500 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vytYL-00084L-AH for qemu-devel@nongnu.org; Sat, 07 Mar 2026 10:26:54 -0500 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-48334ee0aeaso84007785e9.1 for ; Sat, 07 Mar 2026 07:26:52 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-439dadb85b8sm11981944f8f.17.2026.03.07.07.26.50 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 07 Mar 2026 07:26:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1772897211; x=1773502011; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=IMoQ3NbTol8pSbdgghPvXG4r2n1wnaW8ZAPS6V4fUYw=; b=pdbPHmCRGVAUAJTVPjwkMSuGN3MDPt02dvfaM7B6ST7kRHV4SRN8TB4mFdD+Otbsao CCeybe1ZGdRphdrDHQJbjijjJJ/wA4nn9JJCyO+9PEsexWKyh05uQ6UyP1DAL4r+Ruqg WGq2/mJcafBuJkta8hsBB1E/skf2XYBLTec+iIUVQF4j/ZvyBL0RRAY6Q5x0tvRZ1yUs 7UBY9dYjo9JMOb2vhxGefzVy0ADBHHQSHiXSo3oSj4wOrUam5isognczPkTw/2IAqTyu zS3a6L9tmLAL9bXjVwmVQ2mS4oJ+gmpy53s3Db6qEBlttMT/z/VlcWwwMQWoMjzhwD9V 87og== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772897211; x=1773502011; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=IMoQ3NbTol8pSbdgghPvXG4r2n1wnaW8ZAPS6V4fUYw=; b=EBD6hByp/IUZ9/WYKtmXYR+RFDkeqCxpDxSQS7SFNT1G9XcHr1TFVDEiTBaR4WfkHY hTtXnfSYfaVbOZx/xxzxvAaHAu78dwjiy+EhCufyqtRjfhlx7K6xXlaCK/FIUqTwCp4C BZNeIWiEF9q5cRN8lZsgXuEkXnV2RMmtnpjWCPXdvfIzf65Woh8BSjHIN14TtdF7Q+37 iHCGFcW0cFvtT/Z5UmVifvlWYf1lca8HSZ27GU25deYda0U/KTHK/p9VgsBOVvgRviVX P9t2wmREpeiTlaiUDJAFD/FO5YW23OjtbVjiTGjwHNWCDGY810UzmPURXutBZM/9Mtov fIdg== X-Gm-Message-State: AOJu0YxBbbr/WL36pyQfigynX1Bz1/PBZvv57Ymnp+CW5wJuQEYYle7V JIr+kKGg6An+YmyVbkQhMfsuFbs52UyQuVqHsBUwfHzBIgx0uBFkQmm6ttflbb8+Z3uWBl14KSp ETTIijqM= X-Gm-Gg: ATEYQzy+3RWCMZH5zj5MLL96LjauIil5c18B93UTY5Qk71S/P2YDxDSID+Gl5UhTTtX zhEhV4/+Hd3MlFQLdGFq+2183aKv7K2OVNiAxmXbbEfZEw8rliGs2o+/Yd2QlTlt0TKgAp6HDiP ncChJbwhQCkf7KCE7Y9KPDDX6Md1fP/zjFVWwmV1SFrfrzlI+VnJoZ6QrYjOnGv1FWSaL4T2UyF bDmLBZImVOwONOOgHWaFdAxbsVtMvm5M3IYzgdBorrLXNiTs8QoNAhqE2cCr+CyVbtYC2h7JwmI 9f3BlyWdCu1/u6d7xszhUgN4saCa2JBR2cxgmedttGuel630XMu3EU3WHI8TjBJqYwAhxBO+ZAA Mb7ITjLRtwKntwE/cKp/zc2QfplUDCCTo7MYZOlKZZ3JuOGDpSTanYp6n3ZaOlVFDp0iBDZRIsg y3Ayo38dZ4BsiLtjoFGhjBFJLgJk90Y1Z4o4PopWZZ+64dTmTedodYlPmCrhwMciCeOC2+EVab X-Received: by 2002:a05:600c:4e89:b0:480:1e9e:f9b with SMTP id 5b1f17b1804b1-48526951acemr87854005e9.16.1772897211330; Sat, 07 Mar 2026 07:26:51 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Yi Liu , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Zhao Liu , "Michael S. Tsirkin" , Igor Mammedov , =?UTF-8?q?Cl=C3=A9ment=20Mathieu--Drif?= , Paolo Bonzini , Stefan Berger , Ani Sinha , Thomas Huth , Marcel Apfelbaum , Richard Henderson , Eduardo Habkost Subject: [PATCH 02/10] hw/i386/pc: Remove PCMachineClass::pvh_enabled field Date: Sat, 7 Mar 2026 16:26:26 +0100 Message-ID: <20260307152635.83893-3-philmd@linaro.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260307152635.83893-1-philmd@linaro.org> References: <20260307152635.83893-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=philmd@linaro.org; helo=mail-wm1-x331.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: 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 @linaro.org) X-ZM-MESSAGEID: 1772897238689154100 The PCMachineClass::pvh_enabled boolean was only used by the pc-q35-3.1 and pc-i440fx-3.1 machines, which got removed. Remove it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth --- include/hw/i386/pc.h | 3 --- hw/i386/pc.c | 6 ++---- hw/i386/x86-common.c | 3 +-- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 5623660f5dd..908de5e1eab 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -110,9 +110,6 @@ struct PCMachineClass { bool enforce_amd_1tb_hole; bool isa_bios_alias; =20 - /* use PVH to load kernels that support this feature */ - bool pvh_enabled; - /* create kvmclock device even when KVM PV features are not exposed */ bool kvmclock_create_always; =20 diff --git a/hw/i386/pc.c b/hw/i386/pc.c index a38634e3577..107f12cbe73 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -597,7 +597,6 @@ void xen_load_linux(PCMachineState *pcms) { int i; FWCfgState *fw_cfg; - PCMachineClass *pcmc =3D PC_MACHINE_GET_CLASS(pcms); X86MachineState *x86ms =3D X86_MACHINE(pcms); =20 assert(MACHINE(pcms)->kernel_filename !=3D NULL); @@ -607,7 +606,7 @@ void xen_load_linux(PCMachineState *pcms) fw_cfg_add_i16(fw_cfg, FW_CFG_NB_CPUS, x86ms->boot_cpus); rom_set_fw(fw_cfg); =20 - x86_load_linux(x86ms, fw_cfg, PC_FW_DATA, pcmc->pvh_enabled); + x86_load_linux(x86ms, fw_cfg, PC_FW_DATA, true); for (i =3D 0; i < nb_option_roms; i++) { assert(!strcmp(option_rom[i].name, "linuxboot_dma.bin") || !strcmp(option_rom[i].name, "pvh.bin") || @@ -941,7 +940,7 @@ void pc_memory_init(PCMachineState *pcms, } =20 if (linux_boot) { - x86_load_linux(x86ms, fw_cfg, PC_FW_DATA, pcmc->pvh_enabled); + x86_load_linux(x86ms, fw_cfg, PC_FW_DATA, true); } =20 for (i =3D 0; i < nb_option_roms; i++) { @@ -1682,7 +1681,6 @@ static void pc_machine_class_init(ObjectClass *oc, co= nst void *data) pcmc->has_reserved_memory =3D true; pcmc->enforce_amd_1tb_hole =3D true; pcmc->isa_bios_alias =3D true; - pcmc->pvh_enabled =3D true; pcmc->kvmclock_create_always =3D true; x86mc->apic_xrupt_override =3D true; assert(!mc->get_hotplug_handler); diff --git a/hw/i386/x86-common.c b/hw/i386/x86-common.c index a420112666a..db8d4e855f4 100644 --- a/hw/i386/x86-common.c +++ b/hw/i386/x86-common.c @@ -704,8 +704,7 @@ void x86_load_linux(X86MachineState *x86ms, * saving the PVH entry point used by the x86/HVM direct boot ABI. * If load_elfboot() is successful, populate the fw_cfg info. */ - if (pvh_enabled && - load_elfboot(kernel_filename, kernel_size, + if (load_elfboot(kernel_filename, kernel_size, header, pvh_start_addr, fw_cfg)) { fclose(f); =20 --=20 2.52.0 From nobody Mon Apr 13 10:53:36 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=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1772897255; cv=none; d=zohomail.com; s=zohoarc; b=KX2//hlV6Ut0ZsRuTHicXe7PzDa8fHUEH+UFHV66qr1Y9ojzYqwOZGTeKxeusET1QO+9mtSE19z4lFoBhJwB2XzXzk0n7gOOhRbqlByi62u6cUJIiPKXJ5Gcu4RJAoXzJCEhVk6YSYO1LXQVlgedoHBmmrMVJvz0+KKd2VV+n0M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772897255; 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=W+cnL7rrglnAkX3oC4Hnt8yatSlp+vMC4sJA5HGzfMk=; b=EJTmstjzfadBxo2xaITKJlNTck1f9Ifbvk9uiDYppFqumTcBtFkDpgzeBQkqrOzWJzOyd0Udmt4EQZFwO/M3gZ9nwn4plAbnCzMiGk4zDcA2ogRMnS3rDMdSPtgXwGuzAMWObJINNLtYpXLAccR/IawIcOwBOLBG34WYbTotkz0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772897255401717.5233782162815; Sat, 7 Mar 2026 07:27:35 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vytYU-0004y8-QL; Sat, 07 Mar 2026 10:27:02 -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 1vytYT-0004xy-Ru for qemu-devel@nongnu.org; Sat, 07 Mar 2026 10:27:01 -0500 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vytYS-00084s-9x for qemu-devel@nongnu.org; Sat, 07 Mar 2026 10:27:01 -0500 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-4852e9ca034so5201145e9.2 for ; Sat, 07 Mar 2026 07:26:59 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4851fb4257csm313924355e9.15.2026.03.07.07.26.57 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 07 Mar 2026 07:26:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1772897218; x=1773502018; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=W+cnL7rrglnAkX3oC4Hnt8yatSlp+vMC4sJA5HGzfMk=; b=WPNPnAkrs0+hQw/bcNc0qoCd1pJH7qLzZI/9dCLXfmuz1PzHynxFNoq9eTYSsjFtt0 bvuP51zNgJ8rnOZ5xUrkMU2Bi+sxI5PLKKr3NmnXNCUukRFheMVFjNBFVXPZkdCcR33x Cy63R49kfqIzugdY6YAL6RZuVaoEvAXrjb5KE5qpLKbXij1PwbZNtHVQNCFFMl7iMTG5 M/C3gV/EfuYMa6n58j8Kl+Ese35Bm32plHeXks5NdUniKwS0+R5a1mZ0OmEgjDY2xT/V YYOb6Nonu+dJ/jA469t9KrWTRmGnafs6Y/TnR5pnQetUJddTjrPPt9qZ/e8KK0Vnsa2a xg0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772897218; x=1773502018; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=W+cnL7rrglnAkX3oC4Hnt8yatSlp+vMC4sJA5HGzfMk=; b=Vxpz7XtvJbQO//lZ2QfYQ9t92G0C0cf4+qE6fa2BVuUtDLyRGDzgJQ8ZHuCpyt9NiJ AGB+CL/OlON+tlIZSXw7D2Jo5ClPbZW8+R/2orxe5cf5+e/VJ4L8In7QSBF6M0ZhHoRi 3BE4d5DeLe6T5QxWWKDjl1Wi2bybDCNcNOLm6KsQ3Qk1O3D0i6Q5L0PJTzbYAwZ7AM4l oEy6EDdLuWQLUZlXBIocMVjFegAoe1nsqHavUp8UlmIjHDdl9Z6GUe2d4wWe1o8f+9hR VHfybE2efNO9jL7SazJSNnjnxH5P8AzD+P77JyRJWLug1aUMEAu9Bq0y5JhBMHBec8zd K9BA== X-Gm-Message-State: AOJu0Ywy1w1HBIvRVOKmGDMl54JACfUjYn0uIa2ew9HBZSOs4PYb7GKv CdBwys1yA2zF6OCthwJLmxgl4BmAPv8U5n0msAQ87q2eck8djb5+19GWLz9JYrUYS/qzoKKO34A B5bPNtK8= X-Gm-Gg: ATEYQzyMkcuiGMGndJU4T0nb0klEy9/cL/9dKIhDa0OOZjg1y+023SZZtrlNy+Lfzc6 FUsrkZGF1jZf/O5rCIBpb3zdW3+Xk5PiB1/kibZB9qe3VdT5wCxx6o0z/YovNabzTm1OKn9z2Um AhToG3xeyuLkRVjHUqGup+hTPkzxsDdlpUL7acqPEYWNyPeGkG8BeaCdeIQBFdKFcv97CRIu/Fs 2lbP9AYR2k+OBGdaqgplBFhI0/eusDN2C8HWkGb4l3vAetR5/FXeviKg8yxYOjIhHX0yWzemCNB No92f472fiTOU2+QIjRC4YbRToka4z6XECe6NoHtxLrbBFYpoDnEbThg8cR7KAdnyKl3Ubt9phO HscnGdKS+jaOCoq7Tu5AlrWvALLnJGMAvGGG29IOsFJC5i+h6njGZMMY9G+5OPHXdvmMSwDEwIH MMrouCQHI1+AcW5m3ACez9WTKTJd1+dUDtN9/pXpwbat4zGI8NWje8/3lVKFAP58Mj5Wb6csjL X-Received: by 2002:a05:600c:c117:b0:485:2f6a:6ed with SMTP id 5b1f17b1804b1-4852f6a07f5mr27134405e9.28.1772897218501; Sat, 07 Mar 2026 07:26:58 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Yi Liu , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Zhao Liu , "Michael S. Tsirkin" , Igor Mammedov , =?UTF-8?q?Cl=C3=A9ment=20Mathieu--Drif?= , Paolo Bonzini , Stefan Berger , Ani Sinha , Thomas Huth , Sergio Lopez , Marcel Apfelbaum , Richard Henderson , Eduardo Habkost , Alexander Graf , Dorjoy Chowdhury Subject: [PATCH 03/10] hw/i386/x86: Remove @pvh_enabled argument in x86_load_linux() Date: Sat, 7 Mar 2026 16:26:27 +0100 Message-ID: <20260307152635.83893-4-philmd@linaro.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260307152635.83893-1-philmd@linaro.org> References: <20260307152635.83893-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=philmd@linaro.org; helo=mail-wm1-x333.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: 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 @linaro.org) X-ZM-MESSAGEID: 1772897257555158500 x86_load_linux()'s @pvh_enabled is now always %true: remove it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth --- include/hw/i386/microvm.h | 2 +- include/hw/i386/x86.h | 3 +-- hw/i386/microvm.c | 2 +- hw/i386/nitro_enclave.c | 2 +- hw/i386/pc.c | 4 ++-- hw/i386/x86-common.c | 3 +-- 6 files changed, 7 insertions(+), 9 deletions(-) diff --git a/include/hw/i386/microvm.h b/include/hw/i386/microvm.h index 6b9a5065272..184b7a8c094 100644 --- a/include/hw/i386/microvm.h +++ b/include/hw/i386/microvm.h @@ -79,7 +79,7 @@ struct MicrovmMachineClass { HotplugHandler *(*orig_hotplug_handler)(MachineState *machine, DeviceState *dev); void (*x86_load_linux)(X86MachineState *x86ms, FWCfgState *fw_cfg, - int acpi_data_size, bool pvh_enabled); + int acpi_data_size); }; =20 struct MicrovmMachineState { diff --git a/include/hw/i386/x86.h b/include/hw/i386/x86.h index a85a5600ce9..71fe6b5e122 100644 --- a/include/hw/i386/x86.h +++ b/include/hw/i386/x86.h @@ -129,8 +129,7 @@ void x86_bios_rom_reload(X86MachineState *x86ms); =20 void x86_load_linux(X86MachineState *x86ms, FWCfgState *fw_cfg, - int acpi_data_size, - bool pvh_enabled); + int acpi_data_size); =20 bool x86_machine_is_smm_enabled(const X86MachineState *x86ms); bool x86_machine_is_acpi_enabled(const X86MachineState *x86ms); diff --git a/hw/i386/microvm.c b/hw/i386/microvm.c index 7ff20512636..5a7889f21b8 100644 --- a/hw/i386/microvm.c +++ b/hw/i386/microvm.c @@ -330,7 +330,7 @@ static void microvm_memory_init(MicrovmMachineState *mm= s) rom_set_fw(fw_cfg); =20 if (machine->kernel_filename !=3D NULL) { - mmc->x86_load_linux(x86ms, fw_cfg, 0, true); + mmc->x86_load_linux(x86ms, fw_cfg, 0); } =20 if (mms->option_roms) { diff --git a/hw/i386/nitro_enclave.c b/hw/i386/nitro_enclave.c index 640b1d8c548..8e72dc49f34 100644 --- a/hw/i386/nitro_enclave.c +++ b/hw/i386/nitro_enclave.c @@ -199,7 +199,7 @@ static void x86_load_eif(X86MachineState *x86ms, FWCfgS= tate *fw_cfg, machine->kernel_cmdline =3D eif_cmdline; } =20 - x86_load_linux(x86ms, fw_cfg, 0, true); + x86_load_linux(x86ms, fw_cfg, 0); =20 unlink(machine->kernel_filename); unlink(machine->initrd_filename); diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 107f12cbe73..b11afa0531c 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -606,7 +606,7 @@ void xen_load_linux(PCMachineState *pcms) fw_cfg_add_i16(fw_cfg, FW_CFG_NB_CPUS, x86ms->boot_cpus); rom_set_fw(fw_cfg); =20 - x86_load_linux(x86ms, fw_cfg, PC_FW_DATA, true); + x86_load_linux(x86ms, fw_cfg, PC_FW_DATA); for (i =3D 0; i < nb_option_roms; i++) { assert(!strcmp(option_rom[i].name, "linuxboot_dma.bin") || !strcmp(option_rom[i].name, "pvh.bin") || @@ -940,7 +940,7 @@ void pc_memory_init(PCMachineState *pcms, } =20 if (linux_boot) { - x86_load_linux(x86ms, fw_cfg, PC_FW_DATA, true); + x86_load_linux(x86ms, fw_cfg, PC_FW_DATA); } =20 for (i =3D 0; i < nb_option_roms; i++) { diff --git a/hw/i386/x86-common.c b/hw/i386/x86-common.c index db8d4e855f4..fde05fa7d7b 100644 --- a/hw/i386/x86-common.c +++ b/hw/i386/x86-common.c @@ -642,8 +642,7 @@ static bool load_elfboot(const char *kernel_filename, =20 void x86_load_linux(X86MachineState *x86ms, FWCfgState *fw_cfg, - int acpi_data_size, - bool pvh_enabled) + int acpi_data_size) { uint16_t protocol; int setup_size, kernel_size, cmdline_size; --=20 2.52.0 From nobody Mon Apr 13 10:53:36 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=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1772897279; cv=none; d=zohomail.com; s=zohoarc; b=kkpa68ErRQoM21Vw0GHH/iMt86TS21P9A4hHgQ2A2p+xr5KIy9Q4G6wHhQiwFjHAIOe67Gt5CGyzPczsjBp1hLNtr1JlTnOJiHGMG31htF2mZWqk6IR5UDjB6PT4KtXv63L1pGVtfxePQGeXwfGkW9iZv45raxDhl1pU/pxeKGY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772897279; 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=i5IyQN2SJFLJ6QDcX5nSCyHv0PTm61zI92Uq2QIvVm4=; b=gnWtCTrDjLjTqd0dGJ0lfze6N+55bjM8n8dcJbswDLD8SX/gsI6R01dWOIrN5uyKVo15cc3zgbL4P/IzRBhkXZ4o5jjssC2/ZyeFeuEyQd/GGAdGE1bTfCFguHSgYyaOylyOvsCaTzeJ8Ljaz2pzMninsiIz/qrzGTsDTLrHePA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772897279767315.21373731392964; Sat, 7 Mar 2026 07:27:59 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vytYe-00050Y-7p; Sat, 07 Mar 2026 10:27:12 -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 1vytYb-0004ze-7r for qemu-devel@nongnu.org; Sat, 07 Mar 2026 10:27:09 -0500 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vytYZ-00085a-F1 for qemu-devel@nongnu.org; Sat, 07 Mar 2026 10:27:09 -0500 Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-439c944bb62so2981998f8f.3 for ; Sat, 07 Mar 2026 07:27:07 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-439dae2b9d8sm12464452f8f.21.2026.03.07.07.27.04 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 07 Mar 2026 07:27:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1772897226; x=1773502026; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=i5IyQN2SJFLJ6QDcX5nSCyHv0PTm61zI92Uq2QIvVm4=; b=yeYYQtBzfmGHAO6WYKPxAOHcCEbRjOh5IQXmOrm07ZdtnZHji65M99hmhQuFc7RPgE FudJA/+ckOqHH/Lv0W9o5O4DSg3VvaEu27g5UQterJ5xYJTTCBcvm+rmHUAJWICW797y 7sShfIs0KWnpiP4O1/rqW9j8oGSWrd/7ZFYN9qmIlXSVaH57Nr8GeGY/ZOxvG+rTO/5J qnNR95S636WzakDWNOJFwZ8ru37n/KzOiag4bYeGhaj6yTKVtbPiK8L1BbD8nRwQ7OOA fAwR+2ry2eZk7ezCiIbOnAZTYY7geFkjSJllSQMtl03SszPhExXhBAsNbpAmUmXFqtqG uzKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772897226; x=1773502026; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=i5IyQN2SJFLJ6QDcX5nSCyHv0PTm61zI92Uq2QIvVm4=; b=NY4V4d9d8UuJLRsABJ6HTZT2R+zy0rlsvxtPi/YN9enV5IawZDEAIQQoZ1Wb9WIa8q Ci4xRuztbE11kc1Ij9rgaknzUSH/M1NVKpzyI4d6uxxbbRyNzPa3Xc/pMM2PVQR/TwAv mIiBnrjfUENnk0+98tigvHqE+aA7s8ntoXKk/mCjd4qAFKq2SGu0mYPhvonYgE65PN/i /t3RbNmF8h3gUyuYYcOnFO+BZBuhLaBfEFtKCn+kWEcTggF68tAzDgB4Jv/D9gcfqBnG dyNeinXOuly8OfDy9XH+gjdpPdIpC9Q/0dKma2qNmmBROiCYqvBzoWUkrsE9MJeWuhKK aghQ== X-Gm-Message-State: AOJu0Yw6CSiGKf8d0tTKH7nBacov3gCj257FC2PAy1So44Noy4pwuoF2 ujmWg76oqaFq6EwIA9dep+MeNdTDvGcO8TfiIktq6JJVQKzzU9AD4bePmSvuC8luT7dYMT579Vh mkldqSk4= X-Gm-Gg: ATEYQzzla87Bk6jmUvKEkp5Zqtabicd247fqdy2bWS2zxXn8C9BIfvdqA0kS7kApnLi EGrufQiJ4M0V6pxHxZJn+RQh1JTNKJuK1/FpkpvPjPWYZTdtdqmLaplp/gtJ0m8K03jv1q2m2Oq vmDNtfZqtFDeIzZqwj/eHoByAd8rrwrspVw03Whye8FUaET8Q3i+XCTQSYj5mrF2xc3LetuzboP A3MxBJqy6gBUWrVkMa8Xp+NpOmanZrVlvbkbx/LaVcvWFCDS9sLhyJf2OjqhB6yO3ONS/m4escB XVHAg0qs7lpaRjrXYJh1DpZoXaUsEc/g21KjKJ2QelDI9i1lPJJZxYJMgfSOryQhE9Se6amWMeX NMcoPNSx3Yz01mq/Deb4cjkRgyJWH6IEPONzvHyY8XXobvfrL0YxAk+TdMoLQzHZevMCCLfswWJ qJNrpDmgTfb3kQoiMROWGV7Lftlu/IuaAbn2tQe7A5VKbU7FC+pPXNHTGnOYUkjmrTQ6qENjqw X-Received: by 2002:a05:6000:4301:b0:439:bce5:64fb with SMTP id ffacd0b85a97d-439da6578d6mr9835670f8f.23.1772897225598; Sat, 07 Mar 2026 07:27:05 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Yi Liu , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Zhao Liu , "Michael S. Tsirkin" , Igor Mammedov , =?UTF-8?q?Cl=C3=A9ment=20Mathieu--Drif?= , Paolo Bonzini , Stefan Berger , Ani Sinha , Thomas Huth , Aurelien Jarno , Marcel Apfelbaum , Corey Minyard , Eduardo Habkost , Yanan Wang Subject: [PATCH 04/10] hw/core/boards: Remove MachineClass::smbus_no_migration_support field Date: Sat, 7 Mar 2026 16:26:28 +0100 Message-ID: <20260307152635.83893-5-philmd@linaro.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260307152635.83893-1-philmd@linaro.org> References: <20260307152635.83893-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=philmd@linaro.org; helo=mail-wr1-x435.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: 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 @linaro.org) X-ZM-MESSAGEID: 1772897281538158500 The MachineClass::smbus_no_migration_support boolean was only used by the pc-q35-3.1 and pc-i440fx-3.1 machines, which got removed. Remove it, along with pm_smbus_vmstate_needed(). Use the unconditional VMSTATE_BOOL() and VMSTATE_STRUCT() macros. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth --- include/hw/core/boards.h | 1 - include/hw/i2c/pm_smbus.h | 7 ------- hw/acpi/piix4.c | 8 +------- hw/i2c/pm_smbus.c | 7 ------- hw/i2c/smbus_eeprom.c | 4 +--- hw/i2c/smbus_ich9.c | 10 ++-------- 6 files changed, 4 insertions(+), 33 deletions(-) diff --git a/include/hw/core/boards.h b/include/hw/core/boards.h index 9ad2a7d5c97..e15dbcea83b 100644 --- a/include/hw/core/boards.h +++ b/include/hw/core/boards.h @@ -314,7 +314,6 @@ struct MachineClass { bool auto_enable_numa_with_memhp; bool auto_enable_numa_with_memdev; bool ignore_boot_device_suffixes; - bool smbus_no_migration_support; bool nvdimm_supported; bool numa_mem_supported; bool auto_enable_numa; diff --git a/include/hw/i2c/pm_smbus.h b/include/hw/i2c/pm_smbus.h index dafe0df4f69..62bbd45e803 100644 --- a/include/hw/i2c/pm_smbus.h +++ b/include/hw/i2c/pm_smbus.h @@ -44,13 +44,6 @@ typedef struct PMSMBus { =20 void pm_smbus_init(DeviceState *parent, PMSMBus *smb, bool force_aux_blk); =20 -/* - * For backwards compatibility on migration, older versions don't have - * working migration for pm_smbus, this lets us ignore the migrations - * for older machine versions. - */ -bool pm_smbus_vmstate_needed(void); - extern const VMStateDescription pmsmb_vmstate; =20 #endif /* PM_SMBUS_H */ diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c index 138ac3d3940..43860d12278 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -205,11 +205,6 @@ static const VMStateDescription vmstate_cpuhp_state = =3D { } }; =20 -static bool piix4_vmstate_need_smbus(void *opaque, int version_id) -{ - return pm_smbus_vmstate_needed(); -} - /* * This is a fudge to turn off the acpi_index field, * whose test was always broken on piix4 with 6.2 and older machine types. @@ -238,8 +233,7 @@ static const VMStateDescription vmstate_acpi =3D { VMSTATE_UINT16(ar.pm1.evt.en, PIIX4PMState), VMSTATE_UINT16(ar.pm1.cnt.cnt, PIIX4PMState), VMSTATE_STRUCT(apm, PIIX4PMState, 0, vmstate_apm, APMState), - VMSTATE_STRUCT_TEST(smb, PIIX4PMState, piix4_vmstate_need_smbus, 3, - pmsmb_vmstate, PMSMBus), + VMSTATE_STRUCT(smb, PIIX4PMState, 3, pmsmb_vmstate, PMSMBus), VMSTATE_TIMER_PTR(ar.tmr.timer, PIIX4PMState), VMSTATE_INT64(ar.tmr.overflow_time, PIIX4PMState), VMSTATE_STRUCT(ar.gpe, PIIX4PMState, 2, vmstate_gpe, ACPIGPE), diff --git a/hw/i2c/pm_smbus.c b/hw/i2c/pm_smbus.c index ead53d2724d..5654d516382 100644 --- a/hw/i2c/pm_smbus.c +++ b/hw/i2c/pm_smbus.c @@ -443,13 +443,6 @@ static const MemoryRegionOps pm_smbus_ops =3D { .endianness =3D DEVICE_LITTLE_ENDIAN, }; =20 -bool pm_smbus_vmstate_needed(void) -{ - MachineClass *mc =3D MACHINE_GET_CLASS(qdev_get_machine()); - - return !mc->smbus_no_migration_support; -} - const VMStateDescription pmsmb_vmstate =3D { .name =3D "pmsmb", .version_id =3D 1, diff --git a/hw/i2c/smbus_eeprom.c b/hw/i2c/smbus_eeprom.c index d9ac556a0ab..693d4762205 100644 --- a/hw/i2c/smbus_eeprom.c +++ b/hw/i2c/smbus_eeprom.c @@ -88,11 +88,9 @@ static int eeprom_write_data(SMBusDevice *dev, uint8_t *= buf, uint8_t len) =20 static bool smbus_eeprom_vmstate_needed(void *opaque) { - MachineClass *mc =3D MACHINE_GET_CLASS(qdev_get_machine()); SMBusEEPROMDevice *eeprom =3D opaque; =20 - return (eeprom->accessed || smbus_vmstate_needed(&eeprom->smbusdev)) && - !mc->smbus_no_migration_support; + return eeprom->accessed || smbus_vmstate_needed(&eeprom->smbusdev); } =20 static const VMStateDescription vmstate_smbus_eeprom =3D { diff --git a/hw/i2c/smbus_ich9.c b/hw/i2c/smbus_ich9.c index 956c9b59bbc..51513e73fde 100644 --- a/hw/i2c/smbus_ich9.c +++ b/hw/i2c/smbus_ich9.c @@ -41,20 +41,14 @@ struct ICH9SMBState { PMSMBus smb; }; =20 -static bool ich9_vmstate_need_smbus(void *opaque, int version_id) -{ - return pm_smbus_vmstate_needed(); -} - static const VMStateDescription vmstate_ich9_smbus =3D { .name =3D "ich9_smb", .version_id =3D 1, .minimum_version_id =3D 1, .fields =3D (const VMStateField[]) { VMSTATE_PCI_DEVICE(dev, ICH9SMBState), - VMSTATE_BOOL_TEST(irq_enabled, ICH9SMBState, ich9_vmstate_need_smb= us), - VMSTATE_STRUCT_TEST(smb, ICH9SMBState, ich9_vmstate_need_smbus, 1, - pmsmb_vmstate, PMSMBus), + VMSTATE_BOOL(irq_enabled, ICH9SMBState), + VMSTATE_STRUCT(smb, ICH9SMBState, 1, pmsmb_vmstate, PMSMBus), VMSTATE_END_OF_LIST() } }; --=20 2.52.0 From nobody Mon Apr 13 10:53:36 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=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1772897275; cv=none; d=zohomail.com; s=zohoarc; b=JbcpRwFL/NeMxSWBieEBmZZvDfyLHfcGqk2yz3SQSoLc0oRt5+fdRqHPcLQffh8x7xAF3GiQJZE1C4IjaaRXIiLKxiN4T/7zNAABvX2tVyOs4AZviwZSrU2PnR32MOcPL7Ar92boWjVmWZc645/WrZUDRm1hXPaCYmEZJHP2Reo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772897275; 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=wU/ORYoX5ce355SU/U4E1I4Pjxf2Ge86mQ2n6Zg+duM=; b=TlzKtvFN90LYKw9KYA5k/D2XMtAAlgjeQncYLv1AcLJRtKJxxgUHx5txHqan3bCezNW6X52xYNDE0VUtfzSD1ATg/+BdHW+hxA3ahgS9vsr4AF5thQh20XaUHTXFZjhs3lS1Q1OmdqhOAnmYcekIO9wms38dPIkZRQs1mIBSg+0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772897275983275.6193721258036; Sat, 7 Mar 2026 07:27:55 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vytYj-00059c-FA; Sat, 07 Mar 2026 10:27: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 1vytYi-00058Q-AF for qemu-devel@nongnu.org; Sat, 07 Mar 2026 10:27:16 -0500 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vytYg-00086Z-O2 for qemu-devel@nongnu.org; Sat, 07 Mar 2026 10:27:16 -0500 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-48529c325f0so9047855e9.0 for ; Sat, 07 Mar 2026 07:27:14 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-485276b7547sm122750245e9.12.2026.03.07.07.27.11 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 07 Mar 2026 07:27:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1772897232; x=1773502032; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=wU/ORYoX5ce355SU/U4E1I4Pjxf2Ge86mQ2n6Zg+duM=; b=H27JEagZdtdEsqd7+Leh6hZa4qy/uYhaPQL3LBxOkcSrcPRGFEPVFw3BRH0QXnwL2u C3HI4rf4zRFbAnFabSqbLRxApJ7iG+/iuyEShKp6O0IMrF4IQEbg1bPz9ikzbW0EMZAk E5qmqiG5kJd3ybudRQ6kJC/SAFXY0lIMn9c0kM+bhYUgv53ynIKPZP2Ptw6P3G9XkBt+ VFl1qL5nafFA9s0AYFgYKkotXs78ZOJ2A83ELrsMbEouB7EJC8hYTMuPM5UCTFAgAM4y WlMOGhY9/gQbgyr6R8B3imTP2I0nl53+y6o/953XlaXvTHyBsft7bZ3F7WKAyXkUWqg9 gIog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772897232; x=1773502032; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=wU/ORYoX5ce355SU/U4E1I4Pjxf2Ge86mQ2n6Zg+duM=; b=HVNFrgRz4Apm8pA6zq3fuSjqf3ABW1Tn1nIvvEcG1Tw8fmjKmH/s2pxfMOD4cHtdRV 6jE+Et6P3tvjCvpXPuqbb+fYFCOafu8TQ3WwgWRe9wqiGdCx4beuzSzVkAPZUr9Ms+IM XJKDUQtVdM6K346LSFmCVGuj/bePUm4FnkDi3qeTkWRrmmi0/h/0RF316InUI/o7Hxdl kECWMqGISM+Ni1LYtrsdi3yAf7kenuqKca2qgndtqVmB1Q0vfzW5oMYJ2GjhI2M8KPjG N3/s3/bXQNsZqh/rJm3WuiwKZ3BiIRBa3397aIaojraTAQcIviHMhqbPz4YEJ/Z0tUIh p1ug== X-Gm-Message-State: AOJu0YwAQSZsbYVjC5FQkXmHlgxqERtjZyI1DbVhuemzqWAO51BGiDS6 G01Tl+CaubuAiB4CrFSl/HUKFP6CC/wGhzWdhEzGSKUKLQ0C7VKeCeMKP+FMx7rm3oVTJmfUWdU pJFBXrr8= X-Gm-Gg: ATEYQzwHvaFk4T85safqN6DiYn6a8q0UF/DzggwLO57Gp/Qjpzs1o9N1Kx5lZIG/ipM GdVPY64hutGcIOGdeDQO8bYyqgZA/OzgvDbDB2FCuz4x5WS7gqdLgRz02yCPZ6oNX69OId5tDId k4QPs0w55KZfZVDdPSXH91r+SCH8NSBNRBPXUL9enkyTRqvCBmGbQzuky5k8hBzsESwa3JcymsG G+aNfKhdpoMZgcJAXTYBMAUEjU6UzC+DA0LR9K9xYuZAWG9Al3OSkfj7imeh41rQ07Aqcc2VDvv gjsZKfxg5IFcXCFY1Y7Bw4V92vo4B/9hJPdIZO3szULsP6tUmXCbVfLkbJVHmbKEIoCJxQ/nTWJ Fu2u8OyQQKKgtRKvtKbeqzhTZa3IzpmPEdMy4vi37ZcsgDcu987RxhZriNdAFSGuW6Ad+tHCKew kghRECYci2ZNZo7cZsu7PzJdIHXQfSUjRk4VpUX4U/+txKhNJB4UQIc4WzRltdQmunvUML1hyr X-Received: by 2002:a05:600c:4e04:b0:477:7a53:f493 with SMTP id 5b1f17b1804b1-4852696759cmr95375645e9.23.1772897232587; Sat, 07 Mar 2026 07:27:12 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Yi Liu , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Zhao Liu , "Michael S. Tsirkin" , Igor Mammedov , =?UTF-8?q?Cl=C3=A9ment=20Mathieu--Drif?= , Paolo Bonzini , Stefan Berger , Ani Sinha , Thomas Huth , Marcel Apfelbaum , Richard Henderson , Eduardo Habkost Subject: [PATCH 05/10] hw/i386/pc: Remove pc_compat_3_1[] array Date: Sat, 7 Mar 2026 16:26:29 +0100 Message-ID: <20260307152635.83893-6-philmd@linaro.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260307152635.83893-1-philmd@linaro.org> References: <20260307152635.83893-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=philmd@linaro.org; helo=mail-wm1-x335.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: 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 @linaro.org) X-ZM-MESSAGEID: 1772897277383158500 The pc_compat_3_1[] array was only used by the pc-q35-3.1 and pc-i440fx-3.1 machines, which got removed. Remove it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth --- include/hw/i386/pc.h | 3 --- hw/i386/pc.c | 25 ------------------------- 2 files changed, 28 deletions(-) diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 908de5e1eab..4e1dd436ab7 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -271,9 +271,6 @@ extern const size_t pc_compat_4_1_len; extern GlobalProperty pc_compat_4_0[]; extern const size_t pc_compat_4_0_len; =20 -extern GlobalProperty pc_compat_3_1[]; -extern const size_t pc_compat_3_1_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 b11afa0531c..93d1a52d712 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -189,31 +189,6 @@ const size_t pc_compat_4_1_len =3D G_N_ELEMENTS(pc_com= pat_4_1); GlobalProperty pc_compat_4_0[] =3D {}; const size_t pc_compat_4_0_len =3D G_N_ELEMENTS(pc_compat_4_0); =20 -GlobalProperty pc_compat_3_1[] =3D { - { "intel-iommu", "dma-drain", "off" }, - { "Opteron_G3" "-" TYPE_X86_CPU, "rdtscp", "off" }, - { "Opteron_G4" "-" TYPE_X86_CPU, "rdtscp", "off" }, - { "Opteron_G4" "-" TYPE_X86_CPU, "npt", "off" }, - { "Opteron_G4" "-" TYPE_X86_CPU, "nrip-save", "off" }, - { "Opteron_G5" "-" TYPE_X86_CPU, "rdtscp", "off" }, - { "Opteron_G5" "-" TYPE_X86_CPU, "npt", "off" }, - { "Opteron_G5" "-" TYPE_X86_CPU, "nrip-save", "off" }, - { "EPYC" "-" TYPE_X86_CPU, "npt", "off" }, - { "EPYC" "-" TYPE_X86_CPU, "nrip-save", "off" }, - { "EPYC-IBPB" "-" TYPE_X86_CPU, "npt", "off" }, - { "EPYC-IBPB" "-" TYPE_X86_CPU, "nrip-save", "off" }, - { "Skylake-Client" "-" TYPE_X86_CPU, "mpx", "on" }, - { "Skylake-Client-IBRS" "-" TYPE_X86_CPU, "mpx", "on" }, - { "Skylake-Server" "-" TYPE_X86_CPU, "mpx", "on" }, - { "Skylake-Server-IBRS" "-" TYPE_X86_CPU, "mpx", "on" }, - { "Cascadelake-Server" "-" TYPE_X86_CPU, "mpx", "on" }, - { "Icelake-Client" "-" TYPE_X86_CPU, "mpx", "on" }, - { "Icelake-Server" "-" TYPE_X86_CPU, "mpx", "on" }, - { "Cascadelake-Server" "-" TYPE_X86_CPU, "stepping", "5" }, - { TYPE_X86_CPU, "x-intel-pt-auto-level", "off" }, -}; -const size_t pc_compat_3_1_len =3D G_N_ELEMENTS(pc_compat_3_1); - /* * @PC_FW_DATA: * Size of the chunk of memory at the top of RAM for the BIOS ACPI tables --=20 2.52.0 From nobody Mon Apr 13 10:53:36 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=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1772897300; cv=none; d=zohomail.com; s=zohoarc; b=WQzbV5Mc2HBSmoXNVU1zjPeayXxLh7yBMAhxoJVHBsqNXH5RNEgOsSCCgr1rHx/VkhKg+BzzlInR/63fFQlCZzx2M2EaCnf1xOo3lwM9iqXxRAZGjVUMpas4zGAvPa1c9p+YjdSlhvevJsfCl20GKj5x1jWjiXJ/W+yxnbo9e3A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772897300; 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=UqlV0omFkY4cd8RSAFIjKr/FAFV4g/FRjEhKaLfJK7Q=; b=E4E/gPG8YELe17MLlUs1UV4eMKAvr4f/eK3HEbr+yFe/VLJk7sAXyqvdwZMQNmHskFgl2l4O14I6T15VyPODLAWFFRwM2o98ojnQifA1XoPSjeAzVK5IPg4E7DG/wy4qbnZyP2W4LbrK6SnLMXMBXbXqCprEhESRt9IIjSsV+zM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772897300364620.8465683229907; Sat, 7 Mar 2026 07:28:20 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vytYu-0005CP-HV; Sat, 07 Mar 2026 10:27: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 1vytYo-0005B1-Uc for qemu-devel@nongnu.org; Sat, 07 Mar 2026 10:27:27 -0500 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vytYn-00086s-BT for qemu-devel@nongnu.org; Sat, 07 Mar 2026 10:27:22 -0500 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-4852a8482fcso10547495e9.3 for ; Sat, 07 Mar 2026 07:27:20 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4851fae0202sm275919625e9.6.2026.03.07.07.27.18 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 07 Mar 2026 07:27:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1772897239; x=1773502039; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=UqlV0omFkY4cd8RSAFIjKr/FAFV4g/FRjEhKaLfJK7Q=; b=vlaGQwkU2xoWIlilPU4C+lFyPHFm3dzZqtN9LVK7xzRkhyg8ORmQF9+AC12h9R7T3/ FX/8RcGS1hN73BUeJbYOuLRFI1bMNvV9uYrOjea2/mYbsXHQYOwECSwI0f36Ohu5+/NL +L/prG32wyM6y8ALxzB2wbYl9VLEGh/dFhzWIQrDK7f9xmNnEkH0jeVbIrUJygSCr+8e 4ASZfXTem71Wa1ZdYzmjV1UXFLZuSjG0s5FQsh5BdeJvxRTyfVPX5JjMVuyYdVFXeeSB vP4s7vCjcDo0bgeC0tLrgR4FwBe01LwjLdtOPg3fV1vGtDlzQk+hcoNbPSfFvsdJAGIR HYRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772897239; x=1773502039; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=UqlV0omFkY4cd8RSAFIjKr/FAFV4g/FRjEhKaLfJK7Q=; b=l6I00ZvIuv+yZEOl3pJQO5lsNRAShqJmhBb4SPsP2OkLeYzkTSkQPBLel4FNPneEZ/ kSmf2TDzcD7LXuXt9IS+ltSn+nx3LHhp5FRMta1dxxx9TsvvlgD6XlitOZAzA1oVscPv EEvaxsevjBo3EEoYjasnIQjmJ5K4Bf77pLUE6GB87lx25dT2te2seKWAyuUnG6F7Q+h2 AdXG3+JFcIqz+MABJnCu/352R6De7yaVb2vgUdIuAT9lFfq7cHd8Pts5KRp3Fu4VE1zi rE+hbjVUkMmwlNWgl/I1FjeD98/jfG5j5fp4cOQ1wa/6Fubbes5R/VI0yoqWmZ5q4vXY CcMg== X-Gm-Message-State: AOJu0YxFiRDR20isspqxwgV75dlP/lYoRzV56QHSv/lLbbvWwiUkZl5i Y2czdUtk0YaDzyXKzfpOaoMmOQgGCKvrPO/1I0TQ7kCsgZDBaket+ewY0MvvqzzL2z6rv4bk24o M8Uuo8PE= X-Gm-Gg: ATEYQzwEudxhfFPtVGhRygDPhPEMbLreu+cRMq8iprg6lnMD/w/lSXMbArKRgJh269q J12auVu9lnL2KT60XaGQ5E/Y8A+YMvb9Iaxb1e4KVdGWg6OAzpDsnlW1B9DCosoy0RBKHd/LDtr Ud+lEE/4Rz4XIlEvBbaybdqho9b2IpLtrglVjo2s50MqXeEBa02hf400hQmF9xGLKYz4VD6/H1G DA++8xbbh3mgqcTQWrI5VCQ5+4z6ACtrYaSzh/7iBX3K0und7YoQsUt0qaIuaINWOp1EZFrb3lP PvBASo2lQuwQJ1sI31WonN0tUNuZBkl6M/I97poiVV/skNtFQCslabLlqnDrHmbv9wnrp1kWwEh Lp68WkiQiqMkD6sNXw3+0eCN/1l3IrneoiL50ygcMym4eNNttmPdpkA7EwOT4WtE7Pkxc6j4ykm PQfrJG3/z8Miijsk/mEJ4yB+7WayGO0kACeVCVjAnvZD8gcO/Ex+tcvzFIME6cIIh9eZ6YXaMA X-Received: by 2002:a05:600c:46c3:b0:480:6bef:63a0 with SMTP id 5b1f17b1804b1-48526959433mr99455745e9.21.1772897239540; Sat, 07 Mar 2026 07:27:19 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Yi Liu , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Zhao Liu , "Michael S. Tsirkin" , Igor Mammedov , =?UTF-8?q?Cl=C3=A9ment=20Mathieu--Drif?= , Paolo Bonzini , Stefan Berger , Ani Sinha , Thomas Huth , Jason Wang , Marcel Apfelbaum , Richard Henderson , Eduardo Habkost Subject: [PATCH 06/10] hw/i386/iommu: Remove IntelIOMMUState::dma_drain field Date: Sat, 7 Mar 2026 16:26:30 +0100 Message-ID: <20260307152635.83893-7-philmd@linaro.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260307152635.83893-1-philmd@linaro.org> References: <20260307152635.83893-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=philmd@linaro.org; helo=mail-wm1-x335.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: 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 @linaro.org) X-ZM-MESSAGEID: 1772897301377158500 The IntelIOMMUState::dma_drain boolean was only set in the pc_compat_3_1[] array, via the 'dma-drain=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 Reviewed-by: Thomas Huth --- include/hw/i386/intel_iommu.h | 1 - hw/i386/intel_iommu.c | 11 +---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/include/hw/i386/intel_iommu.h b/include/hw/i386/intel_iommu.h index 54c2b6b77a0..e44ce318417 100644 --- a/include/hw/i386/intel_iommu.h +++ b/include/hw/i386/intel_iommu.h @@ -314,7 +314,6 @@ struct IntelIOMMUState { bool intr_eime; /* Extended interrupt mode enabled */ OnOffAuto intr_eim; /* Toggle for EIM cabability */ uint8_t aw_bits; /* Host/IOVA address width (in bits) */ - bool dma_drain; /* Whether DMA r/w draining enabled */ bool pasid; /* Whether to support PASID */ bool fs1gp; /* First Stage 1-GByte Page Support */ =20 diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c index d24ba989bfc..f395fa248c0 100644 --- a/hw/i386/intel_iommu.c +++ b/hw/i386/intel_iommu.c @@ -4205,7 +4205,6 @@ static const Property vtd_properties[] =3D { DEFINE_PROP_BOOL("snoop-control", IntelIOMMUState, snoop_control, fals= e), DEFINE_PROP_BOOL("x-pasid-mode", IntelIOMMUState, pasid, false), DEFINE_PROP_BOOL("svm", IntelIOMMUState, svm, false), - DEFINE_PROP_BOOL("dma-drain", IntelIOMMUState, dma_drain, true), DEFINE_PROP_BOOL("stale-tm", IntelIOMMUState, stale_tm, false), DEFINE_PROP_BOOL("fs1gp", IntelIOMMUState, fs1gp, true), }; @@ -5000,11 +4999,8 @@ 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 | VTD_ECAP_PT | - VTD_CAP_MAMV | VTD_CAP_PSI | VTD_CAP_SSLPS | + VTD_CAP_MAMV | VTD_CAP_PSI | VTD_CAP_SSLPS | VTD_CAP_DRAIN | VTD_CAP_ESRTPS | VTD_CAP_MGAW(s->aw_bits); - if (s->dma_drain) { - s->cap |=3D VTD_CAP_DRAIN; - } if (x86_iommu->dma_translation) { if (s->aw_bits >=3D VTD_HOST_AW_39BIT) { s->cap |=3D VTD_CAP_SAGAW_39bit; @@ -5582,11 +5578,6 @@ static bool vtd_decide_config(IntelIOMMUState *s, Er= ror **errp) return false; } =20 - if (s->scalable_mode && !s->dma_drain) { - error_setg(errp, "Need to set dma_drain for scalable mode"); - return false; - } - if (s->pasid && !s->scalable_mode) { error_setg(errp, "Need to set scalable mode for PASID"); return false; --=20 2.52.0 From nobody Mon Apr 13 10:53:36 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=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1772897265; cv=none; d=zohomail.com; s=zohoarc; b=bBQqZD31AC6si2vY8yEaXJAk2SEglZvM1jSsW8MKlmG0v51qUBgnSCL62BnXnz6OmHzo+OK7nKRuhwJxRfkzVenYYAnX1XfC61PIrVFiehpM4x0fLd0R6zkOG3f4dBN24lMnhIIf4lAoRCpTpe0A8y7nU4powchsIEHVSnF5SEg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772897265; 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=WHfk4tegfEqAizkt/EcVWOA+WVc3XLIBmbGzuDnS9gI=; b=VPK4I/k7Xn1BL3i/YZmVvYw4SSXSp59dUbeh21CaFe7nKiunSyl85QQc3LMO/HXuEWG4voUE5Fq/q5A0JVJccWTmnnz8iZWWiiPhMr2E8FjcpjlErzHLrKN4YqepQDgEMNkvDahQk0xbgMaxDbJFHUXMEecxG8CLKLXcdKu8kpc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772897265229148.00839838785635; Sat, 7 Mar 2026 07:27:45 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vytYy-0005Np-04; Sat, 07 Mar 2026 10:27: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 1vytYw-0005In-4p for qemu-devel@nongnu.org; Sat, 07 Mar 2026 10:27:30 -0500 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vytYu-000878-IO for qemu-devel@nongnu.org; Sat, 07 Mar 2026 10:27:29 -0500 Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-439b7c2788dso4740778f8f.1 for ; Sat, 07 Mar 2026 07:27:28 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4852e38c013sm108804195e9.8.2026.03.07.07.27.25 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 07 Mar 2026 07:27:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1772897246; x=1773502046; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=WHfk4tegfEqAizkt/EcVWOA+WVc3XLIBmbGzuDnS9gI=; b=V+xUljdb7SAYLESiT15DhT1D8OJyPvEhS8ipXH9QaTnvEt3zdZ3lUMOTysprvUdEB2 1vxtdTuQgk6e7W+EEsxYn6cFhbkkoXYHTtKS+YtYa1MoLMgPQNwsPvIvLV7y5/Z6dObn mYY4UseK8KVs4pUSmkqZciu0WDEYlwb6aOkmxzPkjI3cWFTotjpX/0PEl/fiBJOY/Ozg mliZMsc5cTqUcGH5et7Mb2mayhn/hdqTBSDS7/ujSBrK10PBLh6T/JfFJItFDnD5yt19 gMziAElxvzVHG83p+RsGxaLWNm0K6RjhTqZUerIw2M8Ju/5xPlRENnepzcTuClkdf+kN x2nQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772897246; x=1773502046; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=WHfk4tegfEqAizkt/EcVWOA+WVc3XLIBmbGzuDnS9gI=; b=ZTF44VLxDyiKQ5e5CEUOFFKKZJDNi/ZhMvE1mT5HZuNx+RN0ma7hP1aMkhf/Busaxa v3xZHmS12/5iQ+lP9ddv4l0vveO3imu/Oy4joYwZazqcbn3eJUsiAbkCUnzWq1RwGf2s Z8vHAZnxZkN6CEMalwQlR52NgNL+XNluZZ2GkSPfLphMQMIEQ07OS/wzwthXg/lQS8T4 HBFTcrvR42wx0yTth5Xy0VOj4VWL2evRWzrMgQGXKt1bHBGYVoVlwlJZPJN+D57uqPgr 223yed9E0uDAOaOQ2hhPGmS6WiNzxM6kgT6PFH0qyYDHvvejPMOIZB4okNRw8Zep6HBB 7zLg== X-Gm-Message-State: AOJu0Yz1zXy8smrC7S4KXyPuzCo8m/cLZcE7zobUb3VosUGb0UiBYBY8 R3dTN09wACn7ITFEf9Vl9xnCmvJP2jZyOPAzY3J6+5x1r2HcXKjHtq5z8dzx+akGaujDiObnri6 LmsToaO8= X-Gm-Gg: ATEYQzwG4OnYFkmtS0QS6xzwh/pUQv62csiDdl+SSIBJZWty7A6ru3pHzq8XDcIamBx ysJPl+hNTwCEzdb1u0MjHDrhhsl3/lr80hzus1w2IHZNkzGyKLEEJBdXMvSjYW2TQlR2ew4PY8e +oWFgI+eG1sEFFYpSnbHOgYiANDj10/9h6aT4yOFkaweSclcfquiGDXlxtQQDXBrJ8MXbDGRUl5 7OKPFgdq52BW0u4a3MUAUowBz/B0mQzhp/MVgyUjhRT6YCRj/WxPux9JU0ybYEJsxmxmUjomHpK djXO/VBniHitZ5c4mtXSGssNwaZh1t3CRIYH7he/8dRSAspYa8uQ02j5sbcFCcuVZvCEIfiE3OQ vIMN4L+mlbZA36AoIAisZ0Wp1y+ojVQaYRPJtNjrEJywxL0s+7G8PEdMWE+k1U1mGJ6b1Jl1oXL uJjgcH9h9Th+fI1myRHMDlkhGawh9vk02KZCPp4nE/Dv9plThRhIVr8o26dJh8NgsvGA1bKVh1V D7RD/YO6ak= X-Received: by 2002:a05:600c:c87:b0:477:54f9:6ac2 with SMTP id 5b1f17b1804b1-485268bd533mr102571425e9.0.1772897246458; Sat, 07 Mar 2026 07:27:26 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Yi Liu , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Zhao Liu , "Michael S. Tsirkin" , Igor Mammedov , =?UTF-8?q?Cl=C3=A9ment=20Mathieu--Drif?= , Paolo Bonzini , Stefan Berger , Ani Sinha , Thomas Huth Subject: [PATCH 07/10] target/i386/cpu: Remove X86CPU::intel_pt_auto_level field Date: Sat, 7 Mar 2026 16:26:31 +0100 Message-ID: <20260307152635.83893-8-philmd@linaro.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260307152635.83893-1-philmd@linaro.org> References: <20260307152635.83893-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=philmd@linaro.org; helo=mail-wr1-x42b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: 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 @linaro.org) X-ZM-MESSAGEID: 1772897267788154100 The X86CPU::intel_pt_auto_level boolean was only set in the pc_compat_3_1[] array, via the 'x-intel-pt-auto-level=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 Reviewed-by: Thomas Huth --- target/i386/cpu.h | 3 --- target/i386/cpu.c | 8 -------- 2 files changed, 11 deletions(-) diff --git a/target/i386/cpu.h b/target/i386/cpu.h index 2b70d56e9b0..5a62aa61579 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -2457,9 +2457,6 @@ struct ArchCPU { /* Only advertise TOPOEXT features that AMD defines */ bool amd_topoext_features_only; =20 - /* Enable auto level-increase for Intel Processor Trace leave */ - bool intel_pt_auto_level; - /* if true fill the top bits of the MTRR_PHYSMASKn variable range */ bool fill_mtrr_mask; =20 diff --git a/target/i386/cpu.c b/target/i386/cpu.c index c77addd2c25..d8cd0d81d7f 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -9565,13 +9565,7 @@ void x86_cpu_expand_features(X86CPU *cpu, Error **er= rp) =20 /* Intel Processor Trace requires CPUID[0x14] */ if ((env->features[FEAT_7_0_EBX] & CPUID_7_0_EBX_INTEL_PT)) { - if (cpu->intel_pt_auto_level) { x86_cpu_adjust_level(cpu, &cpu->env.cpuid_min_level, 0x14); - } else if (cpu->env.cpuid_min_level < 0x14) { - mark_unavailable_features(cpu, FEAT_7_0_EBX, - CPUID_7_0_EBX_INTEL_PT, - "Intel PT need CPUID leaf 0x14, please set by \"-cpu ...,i= ntel-pt=3Don,min-level=3D0x14\""); - } } =20 /* @@ -10589,8 +10583,6 @@ static const Property x86_cpu_properties[] =3D { * to the specific Windows version being used." */ DEFINE_PROP_INT32("x-hv-max-vps", X86CPU, hv_max_vps, -1), - DEFINE_PROP_BOOL("x-intel-pt-auto-level", X86CPU, intel_pt_auto_level, - true), DEFINE_PROP_BOOL("x-l1-cache-per-thread", X86CPU, l1_cache_per_core, t= rue), DEFINE_PROP_BOOL("x-force-cpuid-0x1f", X86CPU, force_cpuid_0x1f, false= ), =20 --=20 2.52.0 From nobody Mon Apr 13 10:53:36 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=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1772897265; cv=none; d=zohomail.com; s=zohoarc; b=HlXpCjEgyJ/qjOA4pNCNGDVGiHL6OPvdwijVKcBsIZSUzwoa1KkCcDDWkTRE725A0yqI0S6abunFEG0EGRs7O5rCJevTAI0Yfz0xYhXdqrG7mn2SH5OmyQepk/exy6M80kQswclBe4ph8GeCrrZxMzkDSDpKyEWc8/oxER/wjyo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772897265; 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=dwCDSeqcjlqyyEF5HiUPsBSLXDo8uF7LDI+JShU3BAk=; b=F55yL7QDVLNz+lVxUhErCCD0Bwzq3aVs9/HKm0s7PyQoRcYrGZ5cswFFB80pSiTcQW5k6Pe9vfqZIGyK2U7cpp50ZlrQIaw0qVX++5BdEpR1VubuCdK2otUIBC43haShgRIdatiZj7U9Lf2YUbSP7y3XJkoe9EKt+GL99/vn/nM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772897265618726.4329455717716; Sat, 7 Mar 2026 07:27:45 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vytZ5-0005iX-GX; Sat, 07 Mar 2026 10:27:39 -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 1vytZ2-0005hA-R9 for qemu-devel@nongnu.org; Sat, 07 Mar 2026 10:27:36 -0500 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vytZ1-00087Q-Ab for qemu-devel@nongnu.org; Sat, 07 Mar 2026 10:27:36 -0500 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-4807068eacbso85676725e9.2 for ; Sat, 07 Mar 2026 07:27:34 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4852470a654sm41107915e9.29.2026.03.07.07.27.32 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 07 Mar 2026 07:27:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1772897253; x=1773502053; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=dwCDSeqcjlqyyEF5HiUPsBSLXDo8uF7LDI+JShU3BAk=; b=BNoY0WyXM0sjO26Z35GbTNQjU89zVMmAraPSgGFoIQBkYsHH/dQe71vz7hbNgqSF/P MXELsxjx25mmVpCDhOjpAWLtOZdEDvslMby8f+4J1Lq/Ne59b8nrZxM7r/rDK5J8P48X ta3IiUzU1aEAv7fBje4dvOB7U8Oe4yHZtxV/mN92R69DcNGePLrwWT1o4uHUf9d/PV61 CL41wSfAFlw6Ndz7cjdrIMEPcDA6u4HTl+a4j+vz2HGf2jH15x3c7OhBLi2FJlwbsUbc XuZCfXTR3t1FExd1bJskF8v/sPqem8jAg6FYLwBfE72Vq1yEKZuZvTzWgOM2nz4BNO30 E0zA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772897253; x=1773502053; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=dwCDSeqcjlqyyEF5HiUPsBSLXDo8uF7LDI+JShU3BAk=; b=EZW2tA9m/q1ysMGOJmRBtkwCVVFJPcXfWjJAh+XNnAC2ZDnScPQ1yK6wPOeJbaOmhI nbbmRf7qyVl6NnPUhPqJ0sXxVCDtIrOJJ4mIzL2nwpxKW6pakH73brGHjlF/4XnyegJ7 fZ6/9NvHncCksVyBtK1EKc97Lno2VFvyCvzq81dSWQO8/9vucNuZl7uAQBm3JGPKWdkp yVo2fua3e5uU8b2f03dd4J86EqBKL6fmYX77TZnbB+XKLCA4S9He+BCYAf6bK/qbU1Ix CmZYbKgjDlT+WBYYMQzH2+kGUPbtz8lG9dhjz2XEqcWm16TQy9tdAo5mf9KQRstAvD3+ n8AA== X-Gm-Message-State: AOJu0Yz9sbGx/D+49nWOh+A9dhLDlhOde/pGN8s71/MWidvVUDno4THZ Jc7OShqWUhrXaGIcsS8VpNKej7pbseKWBhAijEVDGL8SeVl0aF+Cgl3qIA9yO2c6bLgif+8Nlrj vSLOgSN8= X-Gm-Gg: ATEYQzwG5IlOh0UKoTfI0RPc+1jgPvoqLjdD2vziSUMUFBc1bujrNC50Bu5WvHS8lio hHNcOAXyNwY+93oXZQfEIEz8+EU6h2EQv34eUfLCX3qhxvQqqmvEURkrZyBcuRI57Jo0TvwCZTa j0RT+Dm6t0qp/89TUrpONdh+x2fXs9++pY/83n0ml49dvjtGFqXoQfphcvZYNqC3V6RTBAuojBo Y1NNhglDG5tGmcoTiclV+a9o/OZtJYREo7hfsKc1AdrCDkGJwGtZbTM1TYWvgbp/yXR/ANV5k9T yaYnopAmSJUYwuwb5+mkNWGlKl43mfhSAyK23mAwvcIyNiaXPQxZxKVf/NGPeIC9N6Mfj5w/Grl fYKoKNrz7FLkCZOrwF4ZkMZGd/b3+fB6nrJTDSZ3EnG4YKShj5WV8sEROgQ0ZON5H/gS9sABBba glfghfN0+HrTVMMQYfPriVPyO7ZUs4lN8uQIic0KD9x/3ob02E7NcncuXopz7ISUqECPW+oVYI X-Received: by 2002:a05:600c:198f:b0:477:9a28:b0a4 with SMTP id 5b1f17b1804b1-485268b8dbemr96810295e9.0.1772897253410; Sat, 07 Mar 2026 07:27:33 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Yi Liu , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Zhao Liu , "Michael S. Tsirkin" , Igor Mammedov , =?UTF-8?q?Cl=C3=A9ment=20Mathieu--Drif?= , Paolo Bonzini , Stefan Berger , Ani Sinha , Thomas Huth , Eduardo Habkost , Marcel Apfelbaum , Yanan Wang Subject: [PATCH 08/10] hw/core/machine: Remove the hw_compat_3_1[] array Date: Sat, 7 Mar 2026 16:26:32 +0100 Message-ID: <20260307152635.83893-9-philmd@linaro.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260307152635.83893-1-philmd@linaro.org> References: <20260307152635.83893-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=philmd@linaro.org; helo=mail-wm1-x330.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: 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 @linaro.org) X-ZM-MESSAGEID: 1772897267379158500 The hw_compat_3_1[] array was only used by the pc-q35-3.1 and pc-i440fx-3.1 machines, which got removed. Remove it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth --- include/hw/core/boards.h | 3 --- hw/core/machine.c | 17 ----------------- 2 files changed, 20 deletions(-) diff --git a/include/hw/core/boards.h b/include/hw/core/boards.h index e15dbcea83b..9155e0cc9ed 100644 --- a/include/hw/core/boards.h +++ b/include/hw/core/boards.h @@ -867,7 +867,4 @@ extern const size_t hw_compat_4_1_len; extern GlobalProperty hw_compat_4_0[]; extern const size_t hw_compat_4_0_len; =20 -extern GlobalProperty hw_compat_3_1[]; -extern const size_t hw_compat_3_1_len; - #endif diff --git a/hw/core/machine.c b/hw/core/machine.c index 162600425b0..9a3d826c3cb 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -221,23 +221,6 @@ GlobalProperty hw_compat_4_0[] =3D { }; const size_t hw_compat_4_0_len =3D G_N_ELEMENTS(hw_compat_4_0); =20 -GlobalProperty hw_compat_3_1[] =3D { - { "pcie-root-port", "x-speed", "2_5" }, - { "pcie-root-port", "x-width", "1" }, - { "memory-backend-file", "x-use-canonical-path-for-ramblock-id", "true= " }, - { "memory-backend-memfd", "x-use-canonical-path-for-ramblock-id", "tru= e" }, - { "tpm-crb", "ppi", "false" }, - { "tpm-tis", "ppi", "false" }, - { "usb-kbd", "serial", "42" }, - { "usb-mouse", "serial", "42" }, - { "usb-tablet", "serial", "42" }, - { "virtio-blk-device", "discard", "false" }, - { "virtio-blk-device", "write-zeroes", "false" }, - { "virtio-balloon-device", "qemu-4-0-config-size", "false" }, - { "pcie-root-port-base", "disable-acs", "true" }, /* Added in 4.1 */ -}; -const size_t hw_compat_3_1_len =3D G_N_ELEMENTS(hw_compat_3_1); - MachineState *current_machine; =20 static char *machine_get_kernel(Object *obj, Error **errp) --=20 2.52.0 From nobody Mon Apr 13 10:53:36 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=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1772897280; cv=none; d=zohomail.com; s=zohoarc; b=g39V0Q6bRL9Xmd/e8uaW3Rd8VZq/hEXqPgqt7Du/m6OuFVYSvqdcGaKNJoE4R7Dz9f26vWylkC6RXRAt7PvoVPQ/cCXw5SFJkLZCmoRjXPRpDPkBPmmFX8OZC9zdt1biItelhKU2Kc/DSPtdnUOYAOReAe+ftImzhHiKhGmTHQM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772897280; 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=Ed60oJ9++GzKnqTVaAPhSrwDc/0rjw+3z9nRpzV/t90=; b=cMB9/xwWlKbaQfOgx/bv0w54HhcTzV9Tx5wtm4mqkhSVj33IKmxUArRChDnSworl5kZOwT5pMhbfW7r6+xZaurQHEibzNwbGj6GHQiDT3vnLiGGW8Oe2RPu6hpnq/4W2gAvnpWScXfRwOFpiC5Nbdp3gRbU3ATggQ1qwYB7yhx4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772897280935280.18373793803244; Sat, 7 Mar 2026 07:28:00 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vytZC-0006J9-Bq; Sat, 07 Mar 2026 10:27:46 -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 1vytZA-00067e-DW for qemu-devel@nongnu.org; Sat, 07 Mar 2026 10:27:44 -0500 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vytZ8-00087v-Nx for qemu-devel@nongnu.org; Sat, 07 Mar 2026 10:27:44 -0500 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-48534b59cf3so159515e9.2 for ; Sat, 07 Mar 2026 07:27:41 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-485276bc6bbsm113721785e9.15.2026.03.07.07.27.39 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 07 Mar 2026 07:27:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1772897260; x=1773502060; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Ed60oJ9++GzKnqTVaAPhSrwDc/0rjw+3z9nRpzV/t90=; b=W3xVFGlNgBMflQIBcagAg5vVnQJs/JVyQlRwxnCQArd7J5Oc6dQtBMjkOT5cQG5Zdk bGYPG63FZip877DyZ1q1KyTUdmo0tFm/HkREVy5UszCOsbEZNYrEKY/oEWF1/4X2dMLF ffSqpkHwC6kiPHaS7TVs4aMX3OB0O5aAl848ZLPLZ1DvjufuQkxBnB0X4KMHiPlo3+Ki 6NCFhrE48fn7uCgjMpWkHo3Zp/NWYgFMgFy+7+3E1LrVdTUoYv+qTW71okveofNIYppw NWVi+KrxsATWHBiVTpyoZNT0Ty0JU1P0wtTzJrzK53+6ulGQ5tvl6PjQS83vMlDSk4TU C3ig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772897260; x=1773502060; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=Ed60oJ9++GzKnqTVaAPhSrwDc/0rjw+3z9nRpzV/t90=; b=rMj2DYDw0yi91f+zLss78QIJ9Ex4rrwc3SzOewnhRWNoMYU90veP5/fjWFxdIKVp0n 48n5M8NxKZJ7XCoYdxzlEPuu6tNIuUfb7UnZA8DFPQmKx2PhuDOaBa3fzG/6d3O7rU/b HRiEMqTdj4vNt8aAzhUMHkxwlBkhQdA6T9NUdRkWhKaGnBygi0S0NL/dDQxuDlp+M/9P 75lNXP89FjsWbh8HNTAeMTJFQxtIaTqXW8ZjOlfhah5iARuIT3SQVsvDxDHS9GpgR7n1 NIiWpiRkfLgQS/p2nPcsxGMnl7sJlzbsqZg8EwFg+u9hB3admZhQ7gsFxtKF7p9K546F TXcg== X-Gm-Message-State: AOJu0YxYPtUyOSngI+dbtzx1VgUOQ8u6HsHxFu22n4IqCzLVDRk96dQ/ LJz1RUk98HOybwITPrGEW/SnI54c4gyOvP8L9snYZsmHMqeUysT+UhxipI6dEZQtRY5cXrWW8zQ UVJiSa0g= X-Gm-Gg: ATEYQzye6pI86czTHYijmyHXD+hxjqrYapfRIiDBZixIyGN6Rp2guiRgXBFH4uHmd28 piX+z9ijUDn8QGIK2bnluMVbU8QtTG7beYm5/tF3IQLiEqE06mor0r5AKMb7RokL27BK2VrG1RR 1KibEl/CkJL849Jw/Ej6O+/iD2UXI5VskvF+71ubkm09pmEQvdQ474+25mar9quL+fSwcZ7xr3N /f1BZUYUQgn7nP3qDys5HsvEBDJinTEpHBpHI0ba4IXsfWtk3RPYAfL7Yn5OzkMpuCvghqv8Sdq xfG812W0+7DISt8YOzXmvyB2UPdJWCpkbEpYetToGX1C9dYiGf3toCE3x1GKwt20DRwT1j0P7bZ 6B2dAXmHy7WWvTGL+mjZUr4QH5AjHZC00/wt26wNFx5aExJrbVIlZMMkXd4sSIYztEn8IRmuvVp p7cMC6A8rqG32dZDif01jvKjvH5FVTHQiXkBjhcWJujQ+D2ZHFirMD6OlG7G/eBUJkA6DHhIz8 X-Received: by 2002:a05:600c:500d:b0:47e:e48b:506d with SMTP id 5b1f17b1804b1-4852695b9f7mr96612415e9.16.1772897260438; Sat, 07 Mar 2026 07:27:40 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Yi Liu , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Zhao Liu , "Michael S. Tsirkin" , Igor Mammedov , =?UTF-8?q?Cl=C3=A9ment=20Mathieu--Drif?= , Paolo Bonzini , Stefan Berger , Ani Sinha , Thomas Huth , Marcel Apfelbaum Subject: [PATCH 09/10] hw/pci-bridge/pcie_rp: Remove PCIESlot::disable_acs field Date: Sat, 7 Mar 2026 16:26:33 +0100 Message-ID: <20260307152635.83893-10-philmd@linaro.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260307152635.83893-1-philmd@linaro.org> References: <20260307152635.83893-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=philmd@linaro.org; helo=mail-wm1-x32d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: 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 @linaro.org) X-ZM-MESSAGEID: 1772897281070158500 The PCIESlot::disable_acs boolean was only set in the hw_compat_3_1[] array, via the 'disable-acs=3Dtrue' 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 Reviewed-by: Thomas Huth --- include/hw/pci/pcie_port.h | 3 --- hw/pci-bridge/pcie_root_port.c | 3 +-- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/include/hw/pci/pcie_port.h b/include/hw/pci/pcie_port.h index 53cd64c5edf..b28af067a66 100644 --- a/include/hw/pci/pcie_port.h +++ b/include/hw/pci/pcie_port.h @@ -60,9 +60,6 @@ struct PCIESlot { PCIExpLinkWidth width; bool flitmode; =20 - /* Disable ACS (really for a pcie_root_port) */ - bool disable_acs; - /* Indicates whether any type of hot-plug is allowed on the slot */ bool hotplug; =20 diff --git a/hw/pci-bridge/pcie_root_port.c b/hw/pci-bridge/pcie_root_port.c index fe3ced56851..7c3e78010b4 100644 --- a/hw/pci-bridge/pcie_root_port.c +++ b/hw/pci-bridge/pcie_root_port.c @@ -117,7 +117,7 @@ static void rp_realize(PCIDevice *d, Error **errp) pcie_aer_root_init(d); rp_aer_vector_update(d); =20 - if (rpc->acs_offset && !s->disable_acs) { + if (rpc->acs_offset) { pcie_acs_init(d, rpc->acs_offset); } return; @@ -151,7 +151,6 @@ static void rp_exit(PCIDevice *d) static const Property rp_props[] =3D { DEFINE_PROP_BIT(COMPAT_PROP_PCP, PCIDevice, cap_present, QEMU_PCIE_SLTCAP_PCP_BITNR, true), - DEFINE_PROP_BOOL("disable-acs", PCIESlot, disable_acs, false), }; =20 static void rp_instance_post_init(Object *obj) --=20 2.52.0 From nobody Mon Apr 13 10:53:36 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=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1772897299; cv=none; d=zohomail.com; s=zohoarc; b=gyr6sqRwnblVwAVCEIDSPQPvq6xWKD3ZbN6wNMsh5FnKqEsnsAqalPFWooUVaY7+Plzvk2h2XbjbwXjvBxZDQPAOKjrYdYn5ZMNYAaydgwB849MRtPHHTimPr0U+52DPz4FskFPrlLTsqgncG0TcMMUE7pk/9q4AdJ6GUlL6Lx8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772897299; 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=UpxJXWcZNG1+ebD1fEdM0IVTOlZtM+I+M3Z4j0NTFmM=; b=Ms7NE5eknuhuuCAZLbQXY1tmSBkAKNgcCNHIMslXGjMReBzPnPjSak8uyid7vYxMiO7Q35LvVFG2OBKkSp2S5a4shpSJZlnkDuUeSJu59Y4HrCy14sA59gOtb8TBw8p5V8Ov2etTJFejaxaJ2GTdRBP0v3KGb84ZsIG/dvC+co4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772897299554239.42922214360806; Sat, 7 Mar 2026 07:28:19 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vytZO-0006a2-L1; Sat, 07 Mar 2026 10:28:00 -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 1vytZH-0006ZA-GC for qemu-devel@nongnu.org; Sat, 07 Mar 2026 10:27:51 -0500 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vytZF-00088L-Ox for qemu-devel@nongnu.org; Sat, 07 Mar 2026 10:27:51 -0500 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-4852f8ac7e9so6740745e9.1 for ; Sat, 07 Mar 2026 07:27:49 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-439dad97abasm10816462f8f.10.2026.03.07.07.27.46 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 07 Mar 2026 07:27:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1772897267; x=1773502067; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=UpxJXWcZNG1+ebD1fEdM0IVTOlZtM+I+M3Z4j0NTFmM=; b=rCk8MU9XjQN7nZdvFYGENHzmW8kDxspek2xiLgQLZybN1Jmph37F5XJW0P87Hc0bMm doHffT6u1ITYlZwod3ZoRSJScQygqog4vfjQ75V1V7svU8TvMY7Jdk0GcZK+CieDPAfG tNTP8YCOT76kbjmxGw3wheMTReTCIwiMUVw+fuj0Kj0unoqPwkLr5uXX2WujScy7v7Fy uBNtgLriW4GPKyiAXety3gkykhBhtDyLUNgsrnSDfN99MbT0k4e90/7sEJeclc9JA1Np 8s0Z1+rS5O//nWv0uIp4QPZW3rfebb2cFLVa+64/yIJpSiskHKP+6YGD2VZUaXjFHclR Et0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772897267; x=1773502067; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=UpxJXWcZNG1+ebD1fEdM0IVTOlZtM+I+M3Z4j0NTFmM=; b=k/H/VNig/ayEHfyCmO/csm38gPvbYnGOIiO5mPbQBUkKN4kkT9wjo0cYVP2xKGlCF/ e15pr9FDO4cF9gBsCpqM9C4sdUdoVA2ogqU5ThHwYob4cCd7MDE9z3fKfk+1HXt+CGxb o/gEKWrHQ1fccDHKm6JkHm9++XPym0nGFzWDbuimUMr3d0D0gUU8G2QsYA6xyrlcQL+F EWsZvVTPZCYWbq4SCSP0Q22ITxwb4rWXzp2o4YGFKTdRsDqYVUSyXXSwnXv7AwpP93h9 I/j3VkfG+r+rJyGB2oHcHtrd157OETht0Ac3xObYGaPNAcSs4K75fUcbcftyD49o1yjl FMJg== X-Gm-Message-State: AOJu0Yz5wbiOiNtAD0i2qjt8RTYKyROFjR3jNxHE32+QCaOzY1KSpAoN CpZ2kFJ8+Z2Cu6AOl+XWuk0Wb93GGeo8j6MXIjI4k0ELfjeT2R2AHPP1QHMbKFFTAqdKavSGbMn xQBx5JLo= X-Gm-Gg: ATEYQzzU5A9eGdCBPmC5UoEalpiCKFOjqahNykMZwWN++kdRU3EXiPSDNzddDba61Jb bgaNFQn7p66gR/pGqHgNGuvBTQcvDg5mOOhipQbnwFcziKYOrQaE4QQ4F0pX8Rc2lkVnzHvHEQV 1ZPqTB8XxHmqM9V6sKiCVsSD5bN2Bpu/8YMYuKfL6pAo8J+w054KFTlpdIFVW8MCgPKFHI5QcSf ZknRtSpdOf1tWZFYmXbwUD5FgC88yKGnKH0FGIER4UJLbox3e42lcYFhMZQOXaKEEy9g/6depzG pf+fnlJMHpY9UE8OJl0u7l01d0SX2mXuxtRK2Ae/79sLmF8UzJG1oFusUGRt/7paT8Z8fAdErUM n0jFT0elxs/JGSHdk0w8+Pvksesfc1xFhp9462wxcwVnyz9f9HAxEW3aNa/E6bmkcPy4/xSnnHe sTZ+zdzjy0/a691165CIyXV1CVECXm0Eoc0hyDrUD/aFCU1fL4rJtdJlacNJ4cmKsusfZhuLck X-Received: by 2002:a05:600c:8b88:b0:485:30d4:6b98 with SMTP id 5b1f17b1804b1-48530d46ef4mr24304575e9.15.1772897267454; Sat, 07 Mar 2026 07:27:47 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Yi Liu , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Zhao Liu , "Michael S. Tsirkin" , Igor Mammedov , =?UTF-8?q?Cl=C3=A9ment=20Mathieu--Drif?= , Paolo Bonzini , Stefan Berger , Ani Sinha , Thomas Huth , Marcel Apfelbaum , Richard Henderson , Eduardo Habkost Subject: [PATCH 10/10] hw/tpm: Remove CRBState::ppi_enabled field Date: Sat, 7 Mar 2026 16:26:34 +0100 Message-ID: <20260307152635.83893-11-philmd@linaro.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260307152635.83893-1-philmd@linaro.org> References: <20260307152635.83893-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=philmd@linaro.org; helo=mail-wm1-x32c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: 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 @linaro.org) X-ZM-MESSAGEID: 1772897301418158500 The CRBState::ppi_enabled boolean was only set in the hw_compat_3_1[] array, via the 'ppi=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 Reviewed-by: Stefan Berger Reviewed-by: Thomas Huth --- hw/tpm/tpm_tis.h | 1 - hw/acpi/tpm.c | 4 ---- hw/i386/acpi-build.c | 2 +- hw/tpm/tpm_crb.c | 12 +++--------- hw/tpm/tpm_tis_common.c | 4 +--- hw/tpm/tpm_tis_isa.c | 7 ++----- 6 files changed, 7 insertions(+), 23 deletions(-) diff --git a/hw/tpm/tpm_tis.h b/hw/tpm/tpm_tis.h index 184632ff66b..0df45f0c716 100644 --- a/hw/tpm/tpm_tis.h +++ b/hw/tpm/tpm_tis.h @@ -75,7 +75,6 @@ typedef struct TPMState { =20 size_t be_buffer_size; =20 - bool ppi_enabled; TPMPPI ppi; } TPMState; =20 diff --git a/hw/acpi/tpm.c b/hw/acpi/tpm.c index cdc02275365..922030a29bf 100644 --- a/hw/acpi/tpm.c +++ b/hw/acpi/tpm.c @@ -25,10 +25,6 @@ void tpm_build_ppi_acpi(TPMIf *tpm, Aml *dev) Aml *method, *field, *ifctx, *ifctx2, *ifctx3, *func_mask, *not_implemented, *pak, *tpm2, *tpm3, *pprm, *pprq, *zero, *one; =20 - if (!object_property_get_bool(OBJECT(tpm), "ppi", &error_abort)) { - return; - } - zero =3D aml_int(0); one =3D aml_int(1); func_mask =3D aml_int(TPM_PPI_FUNC_MASK); diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index f622b91b76a..6b7cd00c5db 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -2218,7 +2218,7 @@ void acpi_setup(void) tables.tcpalog->data, acpi_data_len(tables.tcpalog)); =20 tpm =3D tpm_find(); - if (tpm && object_property_get_bool(OBJECT(tpm), "ppi", &error_abort))= { + if (tpm) { tpm_config =3D (FwCfgTPMConfig) { .tpmppi_address =3D cpu_to_le32(TPM_PPI_ADDR_BASE), .tpm_version =3D tpm_get_version(tpm), diff --git a/hw/tpm/tpm_crb.c b/hw/tpm/tpm_crb.c index 8723536f931..40ffc7b006b 100644 --- a/hw/tpm/tpm_crb.c +++ b/hw/tpm/tpm_crb.c @@ -43,7 +43,6 @@ struct CRBState { =20 size_t be_buffer_size; =20 - bool ppi_enabled; TPMPPI ppi; }; typedef struct CRBState CRBState; @@ -228,16 +227,13 @@ static const VMStateDescription vmstate_tpm_crb =3D { =20 static const Property tpm_crb_properties[] =3D { DEFINE_PROP_TPMBE("tpmdev", CRBState, tpmbe), - DEFINE_PROP_BOOL("ppi", CRBState, ppi_enabled, true), }; =20 static void tpm_crb_reset(void *dev) { CRBState *s =3D CRB(dev); =20 - if (s->ppi_enabled) { - tpm_ppi_reset(&s->ppi); - } + tpm_ppi_reset(&s->ppi); tpm_backend_reset(s->tpmbe); =20 memset(s->regs, 0, sizeof(s->regs)); @@ -303,10 +299,8 @@ static void tpm_crb_realize(DeviceState *dev, Error **= errp) memory_region_add_subregion(get_system_memory(), TPM_CRB_ADDR_BASE + sizeof(s->regs), &s->cmdmem); =20 - if (s->ppi_enabled) { - tpm_ppi_init(&s->ppi, get_system_memory(), - TPM_PPI_ADDR_BASE, OBJECT(s)); - } + tpm_ppi_init(&s->ppi, get_system_memory(), + TPM_PPI_ADDR_BASE, OBJECT(s)); =20 if (xen_enabled()) { tpm_crb_reset(dev); diff --git a/hw/tpm/tpm_tis_common.c b/hw/tpm/tpm_tis_common.c index f594b15b8ab..712d64b60f1 100644 --- a/hw/tpm/tpm_tis_common.c +++ b/hw/tpm/tpm_tis_common.c @@ -821,9 +821,7 @@ void tpm_tis_reset(TPMState *s) s->be_buffer_size =3D MIN(tpm_backend_get_buffer_size(s->be_driver), TPM_TIS_BUFFER_MAX); =20 - if (s->ppi_enabled) { - tpm_ppi_reset(&s->ppi); - } + tpm_ppi_reset(&s->ppi); tpm_backend_reset(s->be_driver); =20 s->active_locty =3D TPM_TIS_NO_LOCALITY; diff --git a/hw/tpm/tpm_tis_isa.c b/hw/tpm/tpm_tis_isa.c index 61e95434f5b..aadca4ed79b 100644 --- a/hw/tpm/tpm_tis_isa.c +++ b/hw/tpm/tpm_tis_isa.c @@ -94,7 +94,6 @@ static void tpm_tis_isa_reset(DeviceState *dev) static const Property tpm_tis_isa_properties[] =3D { DEFINE_PROP_UINT32("irq", TPMStateISA, state.irq_num, TPM_TIS_IRQ), DEFINE_PROP_TPMBE("tpmdev", TPMStateISA, state.be_driver), - DEFINE_PROP_BOOL("ppi", TPMStateISA, state.ppi_enabled, true), }; =20 static void tpm_tis_isa_initfn(Object *obj) @@ -132,10 +131,8 @@ static void tpm_tis_isa_realizefn(DeviceState *dev, Er= ror **errp) memory_region_add_subregion(isa_address_space(ISA_DEVICE(dev)), TPM_TIS_ADDR_BASE, &s->mmio); =20 - if (s->ppi_enabled) { - tpm_ppi_init(&s->ppi, isa_address_space(ISA_DEVICE(dev)), - TPM_PPI_ADDR_BASE, OBJECT(dev)); - } + tpm_ppi_init(&s->ppi, isa_address_space(ISA_DEVICE(dev)), + TPM_PPI_ADDR_BASE, OBJECT(dev)); } =20 static void build_tpm_tis_isa_aml(AcpiDevAmlIf *adev, Aml *scope) --=20 2.52.0