From nobody Sat Apr 11 21:30:49 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=1773067983; cv=none; d=zohomail.com; s=zohoarc; b=ktEy5RpFHUlAnAmQkmOwty8u7MHCsiC9UtS/FC3wt51G27C4oLjdFwRHFtciTrnqwG+dAdVFQQiCQ6NUw5yjM8GWS8pzVfooUNJ9b2WRbv3sQZ2lSRA743T6ZGmZnoQoXoFJUmBaY4dL0c9CYeCmpBwfO15a6EnwUavTG9HdMpQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773067983; 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=NngTNdq24X5y9HO0NgvOvHi/Olf87roj8zALJBcI8aU=; b=dRPX54rGvzKXQI03jrKKNaGWUGiaN1tVlMgM+/x76B8XEcPN6V/wRZrj377fxt18Gwl0QV6BMi6gxcFvcy1ua2zCEjx/XbGx1yagD+NeDJmZ/U0WGoJEVMLTfNY7YJTLr/MJ1E74L+U2nCHWqQT2uwxQ7zotoIX8eJzgbL5j0rc= 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 1773067983620272.47027722561586; Mon, 9 Mar 2026 07:53:03 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzbwd-0003qt-Nx; Mon, 09 Mar 2026 10:50:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vzbwC-0003MP-8T for qemu-devel@nongnu.org; Mon, 09 Mar 2026 10:50:28 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vzbw9-0005eA-Gp for qemu-devel@nongnu.org; Mon, 09 Mar 2026 10:50:27 -0400 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-48538c5956bso13409485e9.0 for ; Mon, 09 Mar 2026 07:50:23 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48540ae5484sm19806785e9.2.2026.03.09.07.50.20 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 09 Mar 2026 07:50:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773067822; x=1773672622; 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=NngTNdq24X5y9HO0NgvOvHi/Olf87roj8zALJBcI8aU=; b=ykfitZHbEjbRScGaxyk9t84VJR4hPepcFCOXkfN2dsr4995i5J4LF/DKowy7uzGbTf 9s3Zhll/xlRTb/uTj+yclt1W9SkEGlSQr5to9cst6+lXWyXR8SqrDb9L7qYpjV70xz6p gXOJUAtfcjc6msdzrBhicPpgRiFAt9NRSgLihTi88CQKsOF18KolqCd5BZ4eoBDaVC2m of+foCsral1TKCdkEkcswBPkfyiGUtVAvjxMMlQdA9P5nLqIt3LOfcWp5QnqYIyN3QMU kOYi8+W4fM5TDNj7MmYIvFja33iZEdzt3hvXOj+1H16et9dR7znTTsdvguh+fjaAe0g3 eNhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773067822; x=1773672622; 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=NngTNdq24X5y9HO0NgvOvHi/Olf87roj8zALJBcI8aU=; b=UmCWVxrzjxpktud99RTwEbzYC8M0BMs4XGMtDVB8x+RmEXFkP5gVHEID5jZDF8Fq0G e8/vpfNYOytgNsbn5ajYH8+FCrpmmI9k+BGY6bRrl46VQnXjSuGCForpBnQRxD76EiW5 Hwqicj/9IjZS9LrJp8VKYt4p3h9Ckeh5OC0RwIM0o0CGaZbJpDRtyqj+D4Y9QNZQGgoE APJIrDAEJ7FTKbk0KL5ACZ1MSlRx7PGEAYEMX74k1Z+1JnSwOYG8Wm+r5j1Lr3wJ+NAU 5zEJxjgQa944ujq9Rt9+tCKZrntepkqkamHpQ3VQACeZcsipwlDtFwmn4wVA/xPjuc6U MaBQ== X-Gm-Message-State: AOJu0YxbqkW+guGEDAcYuQSms+0N73S5TRZzmKrcr6jHe1chICMNOvj3 8/J+aektIytyNg+wlO+pcNzHjqswdy37wc/kWHt5BOoQtP4Y0G5fCd4b7PTCTUnJts5KENJuvvj Jfly/pSk= X-Gm-Gg: ATEYQzxlOlX97xg/KwqDJ2kDnZqst3TJfR3UBBv6b1umY3kDq34qUIXkrLaYNeg3j47 1bnVIJNEG9PIVbYP77NVQAD30X3g3I7AQgGXReGOVUEkxosX3yoP25bQP34L1dP3flSCrdeQhRI ew0xQoESDqsfsVdzM+7cCZe/DwZ0vjKAzvg3nVYFM4ogRWHfbpd+dcAjZNprpUW5LL1lC+oFmGW ieYO7023N4LgDccasWx8A0l43DN455O3zE+XuApE5GrhJwYxb14WWmM2M1WgHCnmji5qF93kgtC QivJB3Pf/zlN1QUGV7KIkOjhIOhvIq/DifYd79R6hEJep1OxN/iaS0SUruAVvy86wlahAJpzEK3 CMtRFRx7ybI3jum2RXkPXRoojzSq6E6X7y293OKSb7err8p+Az21OZKJVDj7VttxIzca6BOWACH rd+Psy2rmAF7zuhd1Gdbt+Z0RsRzHtRtCuUWsyBevfJnf1CuBsED5UNOYSMo8mGxcaC/diX6AJx TtHkQ== X-Received: by 2002:a05:600c:3b9a:b0:485:3c11:de84 with SMTP id 5b1f17b1804b1-4853c11e970mr48719215e9.14.1773067822191; Mon, 09 Mar 2026 07:50:22 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Zhao Liu , Yi Liu , Paolo Bonzini , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Michael S. Tsirkin" , Marcel Apfelbaum , Richard Henderson , Eduardo Habkost Subject: [PATCH v2 01/10] hw/i386/pc: Remove deprecated pc-q35/pc-i440fx/xenfv 3.1 machines Date: Mon, 9 Mar 2026 15:50:03 +0100 Message-ID: <20260309145013.44327-2-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260309145013.44327-1-philmd@linaro.org> References: <20260309145013.44327-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::336; envelope-from=philmd@linaro.org; helo=mail-wm1-x336.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: 1773067986157154100 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 Message-Id: <20260307152635.83893-2-philmd@linaro.org> Reviewed-by: Zhao Liu --- hw/i386/pc_piix.c | 25 ------------------------- hw/i386/pc_q35.c | 14 -------------- 2 files changed, 39 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 29c8e997131..2b94c472446 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) { @@ -679,16 +666,4 @@ static void xenfv_machine_4_2_options(MachineClass *m) =20 DEFINE_PC_MACHINE(xenfv_4_2, "xenfv-4.2", pc_xen_hvm_init, xenfv_machine_4_2_options); - -static void xenfv_machine_3_1_options(MachineClass *m) -{ - pc_i440fx_machine_3_1_options(m); - m->desc =3D "Xen Fully-virtualized PC"; - m->alias =3D "xenfv"; - m->max_cpus =3D HVM_MAX_VCPUS; - m->default_machine_opts =3D "accel=3Dxen,suppress-vmdesc=3Don"; -} - -DEFINE_PC_MACHINE(xenfv, "xenfv-3.1", pc_xen_hvm_init, - xenfv_machine_3_1_options); #endif 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.53.0 From nobody Sat Apr 11 21:30:49 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=1773067984; cv=none; d=zohomail.com; s=zohoarc; b=WbbkSwyQEkSTby2lsDbseibEGgVAeT9KPgYDni8Rs+zpCHX1KLMZKTr/2zaCRfEw+GM13O0+wuajrsoV09tlKOR12XGAVRn3V6mBMoq59ALsIXEYvIP29EXuyAzDf1XPpxemIfN6cws36OikCohkgKn3zPHnd4NDkg6Ljpm5opI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773067984; 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=twH0MoLU9gm5rBOzlpHaIy0topLpBsNv4557Fsob2w8=; b=Js6v2Yy6pqeMgFu7n8Mc7jfwRb90I24LwqELWmqWXAUj58Qa76g6+MwcqtOl+BdH2/nXxM1JUvoaf8o2ijRPTlYziIE9Mg2IWuWOjfp4ldIwARfY4ZfwKXo4eV8KE0TgGRhOlZxI4pXCH/OjIaBihvvue39HFpQT9DitR5tS9Ls= 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 1773067984785660.1947579383051; Mon, 9 Mar 2026 07:53:04 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzbxC-0004Hc-BR; Mon, 09 Mar 2026 10:51:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vzbwI-0003WK-2T for qemu-devel@nongnu.org; Mon, 09 Mar 2026 10:50:36 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vzbwF-0005fJ-RI for qemu-devel@nongnu.org; Mon, 09 Mar 2026 10:50:33 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-483487335c2so98742115e9.2 for ; Mon, 09 Mar 2026 07:50:31 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4852f369118sm76824055e9.20.2026.03.09.07.50.28 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 09 Mar 2026 07:50:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773067830; x=1773672630; 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=twH0MoLU9gm5rBOzlpHaIy0topLpBsNv4557Fsob2w8=; b=lyNdX39M++8ik/1y/XKCQKFwC9ovMSHBlybt/aDULOiybxrHmlJVy2StJmIoO9xdo1 2UnztWsojzt+4pvKZIEVL401FDkm05RuWJZwprEkm01uzMz88sbB9rDxmNteWuQ1r0dV Wp09kyVEkqHQb3adoYqY77AeIfbgJ03zBlBGIrcmdFvIBzoh5Ff5F1OLs0IVzsJ4n5Rj tyGFlOzgWAd7PphfjC31yqj3JsXUM6ciqFcGreYEjX4V/zHjkNxOpBXKiu2bzyAZJHY6 RWCUt5PqnzYI/84KJMxOSeqfPO5GCeGuHDAP8JWmaJC2JSEaDWU4QWya9xYp4lZZ2VLE GPMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773067830; x=1773672630; 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=twH0MoLU9gm5rBOzlpHaIy0topLpBsNv4557Fsob2w8=; b=lnB0Xke23t+wFmUJ/KEIpIWYMH8X0IbsIz+rlPnn2HsoRCEynm8CcwQqwixaURFf+5 Cy5nFg4UcljPdgebiztLzB5e9N6BaGjMngF79/cy+91Zl5qApyjZCFk2bf9Fut62tP49 ZGfl/jXBXMTndc5xvP40NX8unStPdcdQ14UgwaefsQDIGRgqO0nzXPxg2nSo2eKTQ1c4 IhwhIPwlF4skZrgYH2rjZ+HydjBKmGxW74bEGwWdULdARHjpcemPSbPiPTSlstBwokwa FB0ZRZSy9mdDytNbK2VJYOlM3dIdf00aKfW1T+Vy/G24Ple9dMJyQwLRqejDtn86iLOg PrtA== X-Gm-Message-State: AOJu0YzWG/ttnXgeJWIeyqnxkn+U0tPE/Cva86B0yDOszNgjClTdCqVM QZZkLZWn5ltFDxIT9yklmgfcH9JmKZg2c4gnB+MIJTSPnFFC+ddnJEiO9jV7CLZ32Bh+sQrDGXd 7MTzdwlw= X-Gm-Gg: ATEYQzzGYA5fL8K6AW/G8eTOLYmpF6GwCiQG1ZFUL1BLp4h36EQ8nhEEi+xyiSCdY/O N90vc6nMqiBStbKhE4piw5R7gWBU0uyT20c2G5mYFPZnpbXjbkEhRa3XINIJcQ/sQOGbccvIxyj G58tPOXQhAf0XI+s25aRmaN3Wkq9H0zJXEeEFXFjVV/pBO9aRgILdzeuiZNHs8RdhWfFQt1Tlcu w8Em657EVRRK8/Vh8gvwqG9xqE7g5uzLuDCqZmvw2VJNSwmcC48n76kEKcrbQ2rxcSh6ZYn+zT/ Bj5oaYNQ8CnkNKB1BGijptdJrLUEpsQdBRE1yZ/TekCQEMoXrvovUgxJdjXbjeaRC/647tTOwZ7 WP5sQEeI2dOx+FJE3j3HCqj1BPxLiOjLwE75+RIGjw2q+5+w9HPyv81bA0nxHYgd0VE1AKRDyP0 BFBK5fBG3KOB5dYdyYgmt3EQxBG69m2WMUxh9GZO4N4QqtYgbiQox0zQqonCmz9IDO2o/yA1IrG DpbcQ== X-Received: by 2002:a05:600c:3b13:b0:47f:f952:d207 with SMTP id 5b1f17b1804b1-48526969359mr218672575e9.19.1773067829463; Mon, 09 Mar 2026 07:50:29 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Zhao Liu , Yi Liu , Paolo Bonzini , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Michael S. Tsirkin" , Marcel Apfelbaum , Richard Henderson , Eduardo Habkost Subject: [PATCH v2 02/10] hw/i386/pc: Remove PCMachineClass::pvh_enabled field Date: Mon, 9 Mar 2026 15:50:04 +0100 Message-ID: <20260309145013.44327-3-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260309145013.44327-1-philmd@linaro.org> References: <20260309145013.44327-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: 1773067987002158500 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 Message-Id: <20260307152635.83893-3-philmd@linaro.org> Reviewed-by: Zhao Liu --- 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 052226baa57..3fc2f0a057e 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -588,7 +588,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); @@ -598,7 +597,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") || @@ -932,7 +931,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++) { @@ -1673,7 +1672,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.53.0 From nobody Sat Apr 11 21:30:49 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=1773068210; cv=none; d=zohomail.com; s=zohoarc; b=lCTQpnJLF+9qbZACnV6Tjd7JA87x+uIjfy5ft7rV9yIaWpttQ6iT/dH+oh0246vkqjptRtUtyef/SQQ5x6n1hMWuGGAksYZ90aH5RNn+34g+mnvPdYC89Y4L68bjN3+2c1qVnhtf++GA5axntJTX0W6FsI2XXYJr4pFPNUD8r3w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773068210; 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=4YdImuSiTgRit+WE2vfmD4259XqnT2hI0YRmPa0sotE=; b=Wkj31LPRGhe/bqlVbiuCXHZlLud/42Ah4nh4FPTB1+Q1WBgQqgoIEmByrMhUvzTE6wpUFTZaF/7no2w5X0EejCVDblbWWGQxuxgOZoWotRUcrKY8VGjluRmcEP6xL5IvFYpsb1ru07J5bb9tqIlFj1ESLwHjXsPintBCnjVEajI= 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 1773068210081949.4149167376481; Mon, 9 Mar 2026 07:56:50 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzbxT-0004Vn-Us; Mon, 09 Mar 2026 10:51:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vzbwO-0003ey-SC for qemu-devel@nongnu.org; Mon, 09 Mar 2026 10:50:45 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vzbwM-0005fv-Kv for qemu-devel@nongnu.org; Mon, 09 Mar 2026 10:50:40 -0400 Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-4327790c4e9so9113582f8f.2 for ; Mon, 09 Mar 2026 07:50:38 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-439dae3c80esm24290704f8f.29.2026.03.09.07.50.35 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 09 Mar 2026 07:50:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773067837; x=1773672637; 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=4YdImuSiTgRit+WE2vfmD4259XqnT2hI0YRmPa0sotE=; b=eN4PiNCBHp1kAZjodDUHriMuZkgtsD04ueO75TQzjfOYytVtqLLW6vQY1W1Ac8qA96 KOSvKOUjhb8N18UHYeny3/Nd369lpya1G2nVir4KPco+H03QsIPNOgyu3TskZNrHBRoo y/b6Jow9FveLOX3C6PgvqTjwkOxICXsUSu1+wRkItli59UjbY5kRHSmwqx/0xOzZgKqz m2ozWXK797b/f7h5yOufZcXdpOp2bQK/B1Zz2EayAzJqGgb0+w6itwaBcN8vRGEvnHvz rmMf9pko5m1MpSps8HVYhOiCVbL5gxR8u9b4PqDmEk5VE36fOO5c4Z5EBpsxaNHZ/RNL D7ZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773067837; x=1773672637; 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=4YdImuSiTgRit+WE2vfmD4259XqnT2hI0YRmPa0sotE=; b=GVrrt56JUkkFl2QiMxecQy9Ok55Aybgu2UbRdtDkMmxSoDh2cSRnF5mrDkzuPxuEri qZwyVY46wi3c93Do2FcK7XyVHBObCIaT90OLJJ+py/rKdP3YPYVTbqlU4krBulAI2I6w 0IVte5CLjiQLw+af58MepAkH+R0AhvMtSlZX+XJK1iRxOLHnC7woUDdxsEmtuS3OpFpr 7PJKQIBxWR6K3PmclZU8yt/95MqWK67aQnKKNd5V6e1U3J/nv91r5s2CHKSZjRpzyzUv GhRm8vG/zvIUrHmIBus4PSTKxPyl2qGmOuScM45PHGIjAXBzj9RRiVIvsiIUH4/bolyV PsDA== X-Gm-Message-State: AOJu0YzGuC0l151aZUunlEtqvNY1zO5Ybio3Vr7fSvYf4ujtR5UDcNFs UuRrBpC8RxHWD+q6vnohC99MTQ3fyDegz67oEOLEv5bgczPyGLrNu/K/JbDIER37Yx3oMyruU9E LEEsjWCo= X-Gm-Gg: ATEYQzyavBaUdI8kjwhW6GRcjfggimu8fg9olO+W0ala3e41a2IG8rwAJjyekMiXBOF KWUjFCaEOOBwgarTPa3tAyY+Z1wJOrW/cE0+Yib8KUN1KI6o4CCJ1b/XYHszrNUHzDRTYCyRaYX 2DotjJ4y97u8Ow6kPexXcGs6hRQoZLqmNnZ74PX4nXwiLKapTvcB++iEZGgMit5I+z7SfUUYwoL 87VjK0AI8HoPdVR5Wm8g4+c92H5kUBlmUMogyyPigQTiOSfBMym+PSv9RUidD/018IIlz21UlTv NtYj+go+cC5WcNeb+FHJmEtf8Sc4tl09qBzQBQPX3yrJjIaXaC1aPthMWwu6xiCRIFWFxL4AWQ2 yuiviipB0XI448bJjcRJkfxMr6kQ6cCH6plE2Dqnhy3+5QodYMCuQh6jxONEMRzP6ip4JjOX40W 2t6UzumvNPlyF6jQiwsds3e0152uLiD7EYOew4ZtzwKpqNhi2a2E/UmiByT/ynW83nddCqrHQFa Jcqnw== X-Received: by 2002:a05:6000:420b:b0:439:b3d2:3765 with SMTP id ffacd0b85a97d-439da55a1f6mr18047442f8f.1.1773067836734; Mon, 09 Mar 2026 07:50:36 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Zhao Liu , Yi Liu , Paolo Bonzini , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Sergio Lopez , Richard Henderson , Eduardo Habkost , "Michael S. Tsirkin" , Marcel Apfelbaum , Alexander Graf , Dorjoy Chowdhury Subject: [PATCH v2 03/10] hw/i386/x86: Remove @pvh_enabled argument in x86_load_linux() Date: Mon, 9 Mar 2026 15:50:05 +0100 Message-ID: <20260309145013.44327-4-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260309145013.44327-1-philmd@linaro.org> References: <20260309145013.44327-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::42a; envelope-from=philmd@linaro.org; helo=mail-wr1-x42a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: 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: 1773068211763154100 x86_load_linux()'s @pvh_enabled is now always %true: remove it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth Message-Id: <20260307152635.83893-4-philmd@linaro.org> Reviewed-by: Zhao Liu --- 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 3fc2f0a057e..00581dd8b44 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -597,7 +597,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") || @@ -931,7 +931,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.53.0 From nobody Sat Apr 11 21:30:49 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=1773068002; cv=none; d=zohomail.com; s=zohoarc; b=ZrWmD1cuT0dwngSZaddzSI+2xnwR4D5DERA8xj9Q0oJ2vxkeQy7rNdCqIMlhNdTk4HLwLz5zglTetnTi2qauv9pIrybuFNs4iqYWpGhzckWIQDxMu5X24aF0maWAXiegJXzeuXOpzKIcrHiqEFPNdPH6mI7Ie7axLLQGdptn7Wc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773068002; 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=9IQmVwB2igYY3QUbm8smw1vlxDB9vgMK4ANQ4xk3vr0=; b=cOZR+VpM+/5auvLaTNOKoBYPRQO0bDUPddUT+10yY/XzFQTq7QiQS4VIVfEshe7zWSOtFys8UgKQVfZzT5M71ShsXNN7597AkDYMRzjj8X61MFQPkMJ5kryc3aBig5wl0q84IlHk3/t5btcX51/2EEN/+3Ui/roaicj5JfNta5g= 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 1773068002932770.372573875283; Mon, 9 Mar 2026 07:53:22 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzbyG-00051N-1F; Mon, 09 Mar 2026 10:52:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vzbwV-0003jX-H2 for qemu-devel@nongnu.org; Mon, 09 Mar 2026 10:50:50 -0400 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 1vzbwT-0005ge-LY for qemu-devel@nongnu.org; Mon, 09 Mar 2026 10:50:47 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-48334ee0aeaso95417395e9.1 for ; Mon, 09 Mar 2026 07:50:45 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4851fae00absm344874895e9.4.2026.03.09.07.50.42 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 09 Mar 2026 07:50:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773067844; x=1773672644; 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=9IQmVwB2igYY3QUbm8smw1vlxDB9vgMK4ANQ4xk3vr0=; b=U6XCnyWqly/ZBEeqoIA9g//naPnC+pJ2lUhQa+kpbRby+1RNqpBn7IYw34nCRpuEq7 0D6s5MOlstDdX7Qxovp54AMxvPSQkOylef4ueLqQDS56yi3hYNRyOcFOGFs8KRTdHm8A EvKaM5MzoTGeNuXCJF/vAP829IWm47Rm4pW1i5BphqBBPeNH3b8yWsg1jNsvqHjgx11K HpTxZE9kT/JFRXsYAXOVSp6vCtJtCrdL/yQVGrOS+1Nl5CrpbXrCGF/SZHAVQnyPVj7V lHWmyJ2G21GdgqOOoNAuItLtYJaabZi6/qte97BnZ7AgSuOHMg483C+trZiOBvD439VG jmOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773067844; x=1773672644; 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=9IQmVwB2igYY3QUbm8smw1vlxDB9vgMK4ANQ4xk3vr0=; b=OjnO1z7mQ2/32TqfgZIexn/Ljb0NWzGjbCyrXpGd4rPBjl3ME7fNmVR4k+KsuGBlsG A4mhrHzqYKWUERoH2nlunT7SDeuiUWSjA5MG+F88SMbq3uJdTOGfQ2Q/NSFYruzrWPZj RE9O8nOZRFf2Vic3vwxAP1cmdXjwwlQ60p8KbLKjW6jL2GiqCel8SLpN/DGebD6qiO+F hlZsQzm98gp+Blk1B59/BXg4J7Q5/PlPFrhlLg+P3BjycUXNAoL1t/JQDVqHwrBamGCI SgBbYJR/BWTh+1eGH73/01z/4RyDI62OvEmEAcoTHlRfL4fpRCmzDD6H0erAdlqDxlwr zWrg== X-Gm-Message-State: AOJu0YyIYL5CL9/lBOfQdIgsbcO3aRSuR7D76FNeFfjWRFua7uBCIea8 oh+d4v66PEti81zRMx/CD0u3oAXLQmc2MM40GafLgtanc2Jw52lY14Aufesl3JKB3QgMWTHqp/v 6kWTV8po= X-Gm-Gg: ATEYQzybK3yKyvH99n7eMGk7MciwPntdRbDazVdOziH0pPEStnGl8ZPw57hu5b3U6OC kY1RSVD0YJNSV/5t1kRTOM6DckQmLFZp9xQ4CRmlSqVvM7PCpTrNHPKWxtbqFOi9S37pbp+/7No sp0haSPQxoN6FFgYtccHw7KSPWfZD/hDr7eX8kF9RF7Z3Sgz/pt6dapzIMZ626+GJoTazEM5vcP rFL/FBeFNeK2URVmywJThmnCAURu+hDjv3QDhp9fCh0qu0cMMwYk1hCspRKYqy7zeNm0/SmGygY cvwDemmXiWO0mxf//s2GXSms8p1h3kiIZDhR7QhMuamqxcwA94s8TUfCVaz1tcx8ydG1/rCopoG 61FRQNPjMjQQkhRQT1bpQzCpwdzOxO16A/V/hHDliYBFsWhpqJW1771w8HPtxZGGmwUqyTgv2IA 9NK9fTk1sVN7Nv52uC/5RezqitrSQd3dsA2r0hcb4hBDanXkqAIYuHOQZg08M4lkAG67qHyXmUk quDKg== X-Received: by 2002:a05:600c:b95:b0:483:7980:4687 with SMTP id 5b1f17b1804b1-48526951b71mr201450145e9.17.1773067843736; Mon, 09 Mar 2026 07:50:43 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Zhao Liu , Yi Liu , Paolo Bonzini , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Michael S. Tsirkin" , Igor Mammedov , Ani Sinha , Marcel Apfelbaum , Aurelien Jarno , Corey Minyard , Eduardo Habkost , Yanan Wang Subject: [PATCH v2 04/10] hw/core/boards: Remove MachineClass::smbus_no_migration_support field Date: Mon, 9 Mar 2026 15:50:06 +0100 Message-ID: <20260309145013.44327-5-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260309145013.44327-1-philmd@linaro.org> References: <20260309145013.44327-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: 1773068003670158500 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 Message-Id: <20260307152635.83893-5-philmd@linaro.org> Acked-by: Corey Minyard Reviewed-by: Zhao Liu --- 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.53.0 From nobody Sat Apr 11 21:30:49 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=1773068009; cv=none; d=zohomail.com; s=zohoarc; b=RApRenUviJZyS9kFGDgwoHyIXi2jfncqOlCpDW+z5EVGog7hq4R+kFgzeQULO3Xf46R9Y4qJJk3k7t9HQqncrFY+eXnJRIB0l7kfvdqER/em2wpi8tdDDTmMvyPU3GoF4HGz5E+7AY7RYkTlX78Uu9hEZllNRzlVzkBYAQ8mmlQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773068009; 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=1Uao/CKWcfJ+UFrA+3AmPlD8nKqx8My4/8hpgD51tDU=; b=dVLM9CG3KtmJ/5kgOKiZH/KOtiK65M+vQOu+OdnvjmO4yrw0G1kQAcjdmf/OlaMDw6ZupE38nCHtHy/rd5EWJFMP7BV39omwQR2K04oV5GMGhm+RKMUb3/D2+ffHGHwdApd89yG1vDn/sRjbJ3fiN3w3SY1ISTSm7/IKFsZLSrM= 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 1773068009188954.7248361960113; Mon, 9 Mar 2026 07:53:29 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzbyG-000522-25; Mon, 09 Mar 2026 10:52:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vzbwc-0003wR-LV for qemu-devel@nongnu.org; Mon, 09 Mar 2026 10:50:55 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vzbwb-0005hS-0v for qemu-devel@nongnu.org; Mon, 09 Mar 2026 10:50:54 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-4853aec185aso10215175e9.1 for ; Mon, 09 Mar 2026 07:50:52 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48536b5b3absm40687275e9.32.2026.03.09.07.50.49 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 09 Mar 2026 07:50:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773067851; x=1773672651; 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=1Uao/CKWcfJ+UFrA+3AmPlD8nKqx8My4/8hpgD51tDU=; b=EtBZjDEwOkSKHu68pjYBoC8aJ8iPVq5CAQFVQubYPKJxi+cRH7kTkE7MYkMu7vFhPz VaGEVRT4bH8QE1D/NKajcmEGiSMdyWSzQG4OCwIoVDJyrt3HnVkvh5krFCenci4WY3eM fGSeg0RtbMBdUpR5cY5jclvmqDwMFDHwR5LeTEU0Au+HLk6s90RDFtAq/aVAm/n1XLId PEzZdubnMi2AjxpGTJyl92OslP0xlmRSEmY0h1gtCDwoa1fWl7Wzf9jT560wXmxTB2gT es4dCuoRga6yFcgjdexrZPs7kB8DeU90nVJGWA7pJ+V+ffvAWxG+bgtQqQ9tfDRfXmBm 9mTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773067851; x=1773672651; 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=1Uao/CKWcfJ+UFrA+3AmPlD8nKqx8My4/8hpgD51tDU=; b=GXj+HL8sner0X1lr3kfALNd+hGouutKDrzwkf47MaZywDykcppL1pQJUzHM0QylOnu IpwNSNGwDcGYDnmTHLgM6/lW3Rh/RYnsveIBgMBSUvMBYlkqj3gICoxjpCjslb4/UmEb IRMGwxlPilsDxe+CaKLQrV3oLfhfq0h049uOh3AGnQ08vrlqXrw4gTWLSKt5JVWvz467 BUFkFFC1o86KLwM6h/5Jpp0Y+I0SCmAYLfMZwsHPAkSDhyv+EnqyI5us46v4NPAD/Nx+ PozAmQSg/jLPx70gO1DP9GRwiO/7MZjzaGcofLAf1yGKpUDVKwH8fpe//H9xpXcykyC4 PbOg== X-Gm-Message-State: AOJu0YzUXu8gro1nUslF9wK6CmXIwE3a8C6fSH9c6ijdomfRt5fAUiof lKdlSXvn5GEFU7HgRuZMPYkYKBZcMTQKnjTIbkAUlnkFiuesIHFCp5QJBAm5lV1J/a1X002P62O 0eR9vsrA= X-Gm-Gg: ATEYQzw7DoY9QgRIIylDLEdjlCuB9/dONiUhABz7rI5HHk/Oqds9JvDLsMHvjPM+INM Tag86pifFyiwvlsJFYkaO5IbokVw2XF0IO/2lNWphA8YqhuH6sodAr1KlwV6ruAqfQYOZU/RNNt NNG/MRzNV9sK2u1KEk7NhE6FrcrJku3aUtYO5yTtcvYhHfFIrr8Kha4CHfBhjTW1wjjMxY5I5YR Jx7irCLunr73bwOPo5vBVs+hMqz4S9vkdWOMjWKp3t+rq43OaQrPJNeZTgzDyK3zl3udx+AtXCT iVGMwr12RqgqKg32JnEwfasY15sFBBlWMMS6ykQ4+oIHnIq7py+0ClIyy7D4QH6n66Vs2BNQhhR yeEuUfP6mCVSVbBxv0cMZ9vTUxXkgeKx+0dUN5GhKPg3+TSJHNIJi5trBtdBpRP+eBbtcuQSoHP 3NAQ9iJJFEH/R/KuXXnYNFYZ3kBuVQK2g+WyCtgf3LdI9S6TcdciAwLBtBEyoVgaYH6r7vrXJ1d jklLGkXZwyY1aal X-Received: by 2002:a05:600c:8708:b0:485:3c8f:e4c5 with SMTP id 5b1f17b1804b1-4853c8fe526mr37311855e9.17.1773067850991; Mon, 09 Mar 2026 07:50:50 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Zhao Liu , Yi Liu , Paolo Bonzini , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Michael S. Tsirkin" , Marcel Apfelbaum , Richard Henderson , Eduardo Habkost Subject: [PATCH v2 05/10] hw/i386/pc: Remove pc_compat_3_1[] array Date: Mon, 9 Mar 2026 15:50:07 +0100 Message-ID: <20260309145013.44327-6-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260309145013.44327-1-philmd@linaro.org> References: <20260309145013.44327-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::32f; envelope-from=philmd@linaro.org; helo=mail-wm1-x32f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: 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: 1773068010450154100 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 Message-Id: <20260307152635.83893-6-philmd@linaro.org> Reviewed-by: Zhao Liu --- 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 00581dd8b44..f33e3f72656 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -180,31 +180,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.53.0 From nobody Sat Apr 11 21:30:49 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=1773068212; cv=none; d=zohomail.com; s=zohoarc; b=kEytg42/U+pqcXXRg4wEctRQOPDsCAhbg09eiHI1U6CdxUPBaLsn79BhQxSL0m4WfuMyEXl4LkIBgU6ZviQeDfiA4suh+P1aqgYXZVpzNma/rWgTJ8/HzS4rft/8JUVKG5YX1q0xbulCbCx3nadL9/VtveHtgHb7g0k6oDcMqzU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773068212; 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=3AcIpsO3Z8lXw3c5iZUqwV5IA07HcbVKYRak/NRH6Uw=; b=Dttvy595HzuRkNnWYRAzDbgkCZJIt3LUlw4PxDK/St3UK0j0EZrCSg10kJY8DcdysTCwfYPj7jY/3BQOmswTntPnqea5sH66AGdCoZmw8TdfjZ4b37YHImbgj8dnPQmnlMHOazZtCrUohumpIlvXMSi49tnuvcbb0ythHGiVoJE= 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 1773068212592856.5805352862562; Mon, 9 Mar 2026 07:56:52 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzbyi-0006uY-GC; Mon, 09 Mar 2026 10:53:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vzbwk-0004Gx-Eg for qemu-devel@nongnu.org; Mon, 09 Mar 2026 10:51:14 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vzbwi-0005j2-9a for qemu-devel@nongnu.org; Mon, 09 Mar 2026 10:51:01 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-485345e1013so11272155e9.1 for ; Mon, 09 Mar 2026 07:50:59 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4853f8f9938sm10968895e9.23.2026.03.09.07.50.57 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 09 Mar 2026 07:50:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773067858; x=1773672658; 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=3AcIpsO3Z8lXw3c5iZUqwV5IA07HcbVKYRak/NRH6Uw=; b=ud/x5TMpTyZ0wTucsIf5qPGjITJfK+VoAUowB5e1t2yfWzSuXvhLywxO9uB/fQCHBn QV3532I3OEaQ5O9j1FFxK6897QHZcKwrPlLddfFbdc41TAypUbOIOwYgbZssk2/qpIaf N7zP8uvVyu003a5mQcCjsv9oQDq0fGDIfsE+tP6EXYkqPE1gspQuVjq69KvU5SzAxlHA 5/wcLyeWu5741Espo7Hrlg86ozwnstm3JCiOXzATrTbyO3LTCIw0rJT8oO0Axg1aOTJT GMPueaSk+g8DcjhFSpx37poejLaJZoG661fzduxroCTDGmIEHrjDnwTLHlhqg1nVyHQb UGEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773067858; x=1773672658; 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=3AcIpsO3Z8lXw3c5iZUqwV5IA07HcbVKYRak/NRH6Uw=; b=RkG2n46SbX1lK4OQ+hk9Ar8E5xUc1E1Lhobo4FeqqHq+kuyheBy6fnXSfEudgAjtyq QffD2monFV0LqFNhb6RWuxv+P9dWB8e/9Y3WAcu8tPOKY412birJjtSXcXSocMA6+Hmc PbOyQyUS/O0HWkbkvTxAlJdKVHRHMEKjO0nfneF3vOXcmSbLdSn0PxyQRqzpKXM6N/mn 92qvlb7UBmIR13Ri9QV62vWckV1s4OGSbBNB/G9nTMfGe32F1TQ/0tGVADtkeIyRXGiI hv1fQ0YvuOUynxDL+J4acSChbzM6ND8Lnetip2+Tj0nh605+24hOHhn5jUf7Xdzk78/y rHuA== X-Gm-Message-State: AOJu0YxrU3FfkZXXAmGptNp1NDPXA4FxsiGFW75A4Q2yoml2TLQp3b27 mYI0hWqLdkOtp+EnO+Ljl0urXi6gL0u5KalZjuDeETFapdhc8zBIsgxJPbNMG1EfKQ3QAwjXPXf nVnm+52U= X-Gm-Gg: ATEYQzygVXNLiedgZe17UYzP+YN6gjAKH6CUC2FHMFuRq9ygz/bFYL7bxvogmbLutwm HmtggZckD1vC70tBdNm36fR3fkEmIR8KeWN+x+gprhA2Lviq8FLHrspC/tEftBtb4AvG6HKDhmc JmBNx/1nZdwR0PvmYyLsukl4nxS5sXUN4E04rkwV64UHd1GTOHijkdktfHRB/qQ9Bq0lbYbVyAg ggO8hKJ3qu3zfa6OrYrBtsGkUpqmxtdWNYoLqPlwIB1dOnycO9ww0gTXhONRtG4WuR6LIsOcH1/ zn1cE/8hg3YFvuM6tnfQF+UctkzUTiLodZtp/EGT+CRg2EWZn4zeA1QcqMg5gupoMPeFI2+EmrP 3bwd/FN2+vs3Wvy0ToXOXNz3w60Uq1eGuFweJDMFlUxjzWQYfkzcAUZJzq9Blrn/Kgq+Ffqa/H/ uzeNXx6ZGR3GRAiPjwbgCpJTz8HudXur73nxjUXTKlJhMlyFRhoDIwvItWq9S6QSsxhnqeLVTOT DsR8g== X-Received: by 2002:a05:600c:3b9a:b0:485:3c11:de84 with SMTP id 5b1f17b1804b1-4853c11e970mr48744735e9.14.1773067858248; Mon, 09 Mar 2026 07:50:58 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Zhao Liu , Yi Liu , Paolo Bonzini , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Michael S. Tsirkin" , Jason Wang , =?UTF-8?q?Cl=C3=A9ment=20Mathieu--Drif?= , Richard Henderson , Eduardo Habkost , Marcel Apfelbaum Subject: [PATCH v2 06/10] hw/i386/iommu: Remove IntelIOMMUState::dma_drain field Date: Mon, 9 Mar 2026 15:50:08 +0100 Message-ID: <20260309145013.44327-7-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260309145013.44327-1-philmd@linaro.org> References: <20260309145013.44327-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::32f; envelope-from=philmd@linaro.org; helo=mail-wm1-x32f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: 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: 1773068214542158500 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 Message-Id: <20260307152635.83893-7-philmd@linaro.org> Reviewed-by: Clement Mathieu--Drif Reviewed-by: Zhao Liu --- 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.53.0 From nobody Sat Apr 11 21:30:49 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=1773068037; cv=none; d=zohomail.com; s=zohoarc; b=bvTLvQv/RQ0PXPNxwy3ZYiCCMQ0BP1zviMY5Is7Qgdfox3/NG1ee623hT1s3DoXogBiNuxECehMhZO+GAqP/kLwcbdl4q1QHfJBkZL8MO4vbcmEXTlp4+qLuwK2ejlmemVocEJp9Nb1f4jv2mPVxzfpG/WpgkBdbZ7VTrIxN9VU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773068037; 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=44Beolhsb9IaT4rslnVVRU0yRvy4qFxSOsfGseaGZiU=; b=Ec8LV+fkxxGrUugIpA5HcZBNfY2ITA20K5evUunrXp44PNVxSR2xKbYKwMQlilkRlh/44Z1tTsE1cgsdJJt5GwpyX6y2yOSgtg+OU3IRwQOuBvISmwxIp1DCfnGh+6XUyVJ3CsK8TDeM9hsAoXC1RcXqyT6k3D2roYRFcaaYJTE= 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 1773068037601594.9989694361951; Mon, 9 Mar 2026 07:53:57 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzbyc-00067h-HZ; Mon, 09 Mar 2026 10:52:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vzbww-0004JF-GA for qemu-devel@nongnu.org; Mon, 09 Mar 2026 10:51:21 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vzbwr-0005jv-BX for qemu-devel@nongnu.org; Mon, 09 Mar 2026 10:51:13 -0400 Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-439aeed8a5bso9124617f8f.3 for ; Mon, 09 Mar 2026 07:51:06 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-439dae2ba66sm23931995f8f.20.2026.03.09.07.51.04 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 09 Mar 2026 07:51:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773067865; x=1773672665; 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=44Beolhsb9IaT4rslnVVRU0yRvy4qFxSOsfGseaGZiU=; b=mZ9QcXV/JIVJ4wGbuSx/IwPsqXkOrAOz4LxX6AZV7Ko0sgShhcxXIYcTAaYv0NnkY1 X1IfNhGgQmvQ5Zs2T5PQZJ8fPxg+YA3KgkzAh2kNHI+Er1WTQz+Pmy9G16q3lvPPXfOS vSLMB3X826eUeIsn3x+chF/k43PdNorYHLxOXBlNVvn2NYRZwD54yEdXBog0ICXYG5Fl lH0p7R4VajGtM379IUvotxvQQseeUaq6NNR1J5EiEPK2NEJXCe3kvfrOqiANHkcSJEPC KEVxK+nSrwHvVrKTTOG/t45TVwOHANp0Ri4U2Mcrbq2P44Gtt9ByBAK7lsM7XmPkyICv vopQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773067865; x=1773672665; 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=44Beolhsb9IaT4rslnVVRU0yRvy4qFxSOsfGseaGZiU=; b=cfjQyu6lna7GB7YAypw51KyjJ+RXoA2988HohENT7a4Bf+QRpn53y68ZLmULUX6wUt zXyNxVfgB+K1cG167rDTF+Le+Fr03BJ7mRllzqboixmnfVKMxK2pNwSBuxVxX+R+oFj2 q/Ziv12aPkuIv1lIWkAlaTr0cW2Y15fSXsaXXuD0lBbb+f+aox97iPaXZ5tGDwKhtCSn i4iyNUGHDa69ph4OVD2FMX8e5w4jRhkOi9id2ZVY5I6SaKv+Z47xAK/OvGs/wQ9IqVDG Z8csTxfHfJ4wPFwqhyF6SHtuLn6UpTLzwGcH8LZVFdK2Jb6y7w/rg0m57z8Y68+NrJFF CRRg== X-Gm-Message-State: AOJu0YzmD+Mjf50YdOSqIpzsNr2/1viCi9TWKEDGNrrUc4899wWH4Qyp TKvfJI0uEAGB8fagfd9lnXUX9ldX1I9kzAykiGx13NXE8rCpjSYlGY5cYqmLI7gQfWFfucn+mxt cxQTNndo= X-Gm-Gg: ATEYQzwku29Jg+0rhGryQ9GRYk24vhUhu+6TPunLsHgQ0WPDP24QVktAKcqdDKL4qG8 z3aDQbXBYpePVP4eNJFsjmiA2wTAwvnUpMEMpt4Ht/3bzhu+yH7tSXtr/S/psCFX/R//v4vnw9Z +7X+4pWW7h86OZ6VFZmyFc9kh0VklvRFKzMxRWvQGhEji/kFCpFLGhsx2nHId5rIIj/w1RY3r2K U9/V2CUBZ4hs1H9l5T6L/vH3bglxJ50Ot3ST4CAIuIirdNtzKJs/uzP7iB2Mi5ZzK3Xsm66XmKN kh0u8V1MvJZI6Pl6CLYrq/4TeCpoUh825agaQAxzQh+Q6wunHcX5EBpn3VlVdP09T/v4okIVvir turiqtXlubDaKx2ZM8HbySpScvVK5bj2q/zVKBFY37yOrCbxzz1RsHo6jlo6j16tGrIGc9mDpRE HgSsf1iScWOz6PSMtZGO6Rm7sdEHCx5yl9mq+xWxsSM0k7dD7BrCL1kbUVdqF36Sc3XqNesRhO4 srcbA== X-Received: by 2002:a05:6000:2481:b0:439:bdd7:4259 with SMTP id ffacd0b85a97d-439da88210cmr21014277f8f.38.1773067864910; Mon, 09 Mar 2026 07:51:04 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Zhao Liu , Yi Liu , Paolo Bonzini , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 07/10] target/i386/cpu: Remove X86CPU::intel_pt_auto_level field Date: Mon, 9 Mar 2026 15:50:09 +0100 Message-ID: <20260309145013.44327-8-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260309145013.44327-1-philmd@linaro.org> References: <20260309145013.44327-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42c; envelope-from=philmd@linaro.org; helo=mail-wr1-x42c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=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: 1773068039305158500 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, let's emove that property and all the code around it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth Message-Id: <20260307152635.83893-8-philmd@linaro.org> Reviewed-by: Zhao Liu --- target/i386/cpu.h | 3 --- target/i386/cpu.c | 10 +--------- 2 files changed, 1 insertion(+), 12 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..0a29ff805fa 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\""); - } + x86_cpu_adjust_level(cpu, &cpu->env.cpuid_min_level, 0x14); } =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.53.0 From nobody Sat Apr 11 21:30:49 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=1773068201; cv=none; d=zohomail.com; s=zohoarc; b=JwzATlHuWDodNIeh3QAaDkRbwFwRAOP3g0td8uUrWrmKl9pQSRXzCZjx0OBDoeY0M34glZSgm/gF8l4WKvrkcvPeY7c5gk+CNb0YYuYrAtY8MQpfL8JOech10fQBTc6reSiqYtTHSnE5wH+mRila2hfylZMUglxcJ9IWPJaFc0I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773068201; 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=pfrbHFhAv8bhscS2w7kB7DC3fNMKySB4UiY5tzkGzOE=; b=HRIqssNpAsPV7pfAQ7pCwlGKuZqlZBR6sbEQTDER5IvP+MSJB3C/e4SIXAqZQoFVTOwdR+y1RvYCK0zW9VXPCIX/ekpMzoMGaz5FbtqF5nYYRo585QhslVJPKmwhl2vmNc1mauEX42/sUM2MzWXognMrH/OT7YLm1CbN/O4i2R0= 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 1773068201603425.042279731087; Mon, 9 Mar 2026 07:56:41 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzbyh-0006mH-C7; Mon, 09 Mar 2026 10:53:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vzbx7-0004LT-Jc for qemu-devel@nongnu.org; Mon, 09 Mar 2026 10:51:30 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vzbww-0005kW-6l for qemu-devel@nongnu.org; Mon, 09 Mar 2026 10:51:15 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-4806ce0f97bso106124505e9.0 for ; Mon, 09 Mar 2026 07:51:13 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-485276b0adasm248388175e9.10.2026.03.09.07.51.10 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 09 Mar 2026 07:51:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773067872; x=1773672672; 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=pfrbHFhAv8bhscS2w7kB7DC3fNMKySB4UiY5tzkGzOE=; b=ON7Z+ns4hWiJ2eD0ZK2czi7L3pv6kBvDd6CrYaDLrx+vWrRperoSrnVmZgEjUiiYpZ yT2npLRaVbAKwHjdAUFv6Bd2PYikP6ic2HgpPU6u/LaFhbDEDQ56agB1lId7vQ92L0hd EwHbKZCjSJEawdmOMR2492xQ4pZ75qhTsvP9LKciJPeQ5JAzYXiNUkah8zd5kkYZYxLV 4y+IvMDt9TgtuoOqNsOZqU0bsEaATTCYFAOJgTrFzqMwwdwry+4bBwJdpRRvjz/ckT4W WDoVvFon3H6r6MQ6tpAY7dr6SNfb/7SHoiDOQJnasKIGAKCgCOUu1S9SXXVxiTUNoNxZ oqhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773067872; x=1773672672; 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=pfrbHFhAv8bhscS2w7kB7DC3fNMKySB4UiY5tzkGzOE=; b=COnf+cT7JNNzNhWDJ3N8ag817dnT5VGeoiTQPv6vmPOPQvshh5XIrLIZrYKcQiO8zr kxO0huGjxfkN9nyx89PV5DlWmrJ5TJS/OYnbPenUf7gUvJqasgSHaRfU6Si0YvmiudaN FWT9ghbPixmgbuXoREc9YcTEAK5xsuIVHkCDQvHguVExKvLzlq8VNYqPIjvi2ZnNLntG sXiaKfpURR6VVmqwmhxiK4CV/06f+RaekkSWsp5NwDky1dsw8P9gCN24bzEiGL890mlg SSZuot7fhB+8wY/mjX9Lu7MiscWHxFcjwVxtSrTlzihtoreWmtdd+/4gPbcuSr3BI8Xq z6kA== X-Gm-Message-State: AOJu0Yx0Iacx3Vpb/6/uAXsrVM5VkAJFe/LYglaS1IMYyg+QJnzaBlJS MRYgrsaQDbldpm3FVJE0oTD6W94tpvk9Wv7eJR3zjDHqL9E4R7+dvL0IrRjlz61IC2SPM1zmyTC mlz6Ku58= X-Gm-Gg: ATEYQzxDTZo8opPpDL0LjAXc0EWc2qfYl9ChxTHhXWPyea+6foI5L6ZgLXFQHRqGqwp QZttjKCo7htT8JKuJQUyVppqN3LZXjcGoRGO1bxJmeUUAVCDg65C7R1Cy62mM0WnIrUpzciDtQE L+8oYuapE/lGtPmGefzv+3JYqzBeSSLyCVdNAUTioe54WaPBeVGRyUNEIAvTVy0FJXbw6u9P3mK fe6okVXieF649YPkNGTcO5bXgWT743caZtKPsbMRJ+TnSnP9iP75bwZwu227vjCjNEQCpZh5cnG tMgOiHKIeuSwIPMgf6ebASaeueMuGeq1niD2gMDXtp1JrfrScM76RBSY4nZWsDGCVxBZivd+wdE OlsPOgJyMt+zp1Or0hqE0bu35LEMdhNrlGu2Terpknavtu8jt6DRtvPojiB+e1iLJ6NGqYItDY2 TU/ghf//3p+Ma3ps7eLuZuztYdEa70LHJbqqCnlFzeUcMSjzg1eDXVWQAAyD9XOGe4u9ho6cQb8 aZ68x//TIVTCuJi X-Received: by 2002:a05:600c:35d2:b0:485:3ca4:4eee with SMTP id 5b1f17b1804b1-4853ca45255mr43424175e9.34.1773067871917; Mon, 09 Mar 2026 07:51:11 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Zhao Liu , Yi Liu , Paolo Bonzini , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Eduardo Habkost , Marcel Apfelbaum , Yanan Wang Subject: [PATCH v2 08/10] hw/core/machine: Remove the hw_compat_3_1[] array Date: Mon, 9 Mar 2026 15:50:10 +0100 Message-ID: <20260309145013.44327-9-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260309145013.44327-1-philmd@linaro.org> References: <20260309145013.44327-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=philmd@linaro.org; helo=mail-wm1-x32b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: 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: 1773068202263158500 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 Message-Id: <20260307152635.83893-9-philmd@linaro.org> Reviewed-by: Zhao Liu --- 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.53.0 From nobody Sat Apr 11 21:30:49 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=1773068019; cv=none; d=zohomail.com; s=zohoarc; b=hV1nAUGoZ3CQZ6A3XIjdhCQInnE2GD5ROprGhpXjQMqTvwsMQsR3l9y8Rim58iaKPuWGUlVM2dQRcGcJKBqE9fhqiZGNojo8XlOHEalKc14CdZm5Zw2u+8mL0bmewSXY9SYIDS5bPV6UA/M9Uk2f8syW1aC8QANgl5UwKcbqwDI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773068019; 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=pgpA3PHGmA2cywOmnIHp4QQstzRdLHRlcUMp4w2UsrY=; b=hRwdQrUkldvuqSfgJ4mSspR0O8b9rsjtqByW3LeGfWld6OvYuNGV0wOuYursQt/gSkLSLbP9asOo3o99lEiS27aNfmp0ICtFiaNVUAQ2rbdVSb1i4FKYMWegF2osg7JYc/uxkynrpk6KSEtANNkVg+bFe/e7y9Vf+thyMkDAadI= 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 1773068019485135.95364304916563; Mon, 9 Mar 2026 07:53:39 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzbyG-00051i-2f; Mon, 09 Mar 2026 10:52:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vzbxB-0004MJ-Ng for qemu-devel@nongnu.org; Mon, 09 Mar 2026 10:51:34 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vzbx2-0005la-Nl for qemu-devel@nongnu.org; Mon, 09 Mar 2026 10:51:22 -0400 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-48334ee0aeaso95423045e9.1 for ; Mon, 09 Mar 2026 07:51:20 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4853a946978sm111340465e9.1.2026.03.09.07.51.17 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 09 Mar 2026 07:51:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773067879; x=1773672679; 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=pgpA3PHGmA2cywOmnIHp4QQstzRdLHRlcUMp4w2UsrY=; b=XPK8xWqwdxcH4Oid8Gs2c2kFLDxwvDmC7iqoNR9x1BNr7goxy5z/xUNYdhoN33LinD R8sqQ0i1dWXlXV17DLk9ipukWVE0loQ/7XLVr+jMRDHgL7OyCRSDq7uAFNbaWAE11H58 VWGbLgD0sXClFu2FVA/QbSMQH5MZQtDXdURshR3B3OMl1gSlh8mNVUlgChyRY9/BC1b/ JgOokskuEtmOR2f0Z0ingR/q09JD04rXkApjZl9b0TwWjEFp48/WDs8V6q6qJmAGNdQz foQ6d/UUeioBsJ6Z4/jqNSUdDMCLzyZUj7lUfLtDiRGeU4vIq0EOxdQ35R5/bNgDHaWY 4KzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773067879; x=1773672679; 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=pgpA3PHGmA2cywOmnIHp4QQstzRdLHRlcUMp4w2UsrY=; b=tsemqwszWWIHd52mfv/KpulNxU+CdrolZT9fXNvuza1bnSOgcRuLB45E9J9S3Huj1U zWqj+SsjnEJcjyRvYHM3nSbBcq8/JBeWt6Zhlw4WhXYSx3McKOjVX9bwGC8Nt8caK4Wm 5qodLnzautxpBDeQqHlCycV5SsD2MSeO1ZsK9vDmNz9727IXIb22m4/HIZfcM+ynNyI+ Cu4bTN+0XOckjiWIMqevjafpghZRcPS261Ly5OgIIBPIkfQDYKUUYsJdLMbXcF89hg+7 BgI6Vyptf2ZI9M1OurZxBQG40ewttHefsl8fA6I5REsEbzjvZHPXdF3QlbX4mBBxMB9s aEMA== X-Gm-Message-State: AOJu0YyVHEJnE5Mco98OHINB0wc0VqE2V46PSey7YuMvcFfrSRrfM2eD HzuBM7Qb+zYaWvdjT+DE9nqMuEVtEd4aDs46yXW8KIcd5cm/2gJQS9lIc2F/K3YZuT8eV+LSBlj 0CPxG0a4= X-Gm-Gg: ATEYQzym3QmsC/zyNbG9utECZMu6XqXuK0vZf1A3od7q2sasMBllZhOxAz2GQPsoboV FB72gMKGez3eL+SvHpuq3qlbccX9iDbGWQPEo3Ht9t8dvaGNTdN+R8exOehHTTC/arfDYENmoKk JDR9ayI6DaQZVo4JV9Ev4VWOQuyznJm656i0Q10k1LsnEZ806sGIksZdL9/bs04IAgyQlxnr5yU yQ0NRoM7HtV5iwl6G2jimIyaUNEp8X5FCeC3KaAJpjOKWdNaX3a89sHFtSZ6wyEtbxvsNUc2mnX E+FpZUiS7Mm6pxgxO46iyMGYfRbPgSw8Dlw4gdCXj1amI4dcJaFCZBLcz7A/dYJw3pzy5VFFOcd KCB1xI5snbEkpJYNH1C4qmokayOAPYkM/ystM2ZoBeGSMFOZubiRUAjIckB+QFruf+ua7G4o25L Q1JGFO9qFuiaRRmfe3atO/NDe1ggXLZUAsE42z9LJlqh0gFB0osMIg7m54pu3r6weVDPoDm+zlc /hqzA== X-Received: by 2002:a05:600c:3515:b0:485:364e:934e with SMTP id 5b1f17b1804b1-485364e94admr93028595e9.21.1773067878792; Mon, 09 Mar 2026 07:51:18 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Zhao Liu , Yi Liu , Paolo Bonzini , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Michael S. Tsirkin" , Marcel Apfelbaum Subject: [PATCH v2 09/10] hw/pci-bridge/pcie_rp: Remove PCIESlot::disable_acs field Date: Mon, 9 Mar 2026 15:50:11 +0100 Message-ID: <20260309145013.44327-10-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260309145013.44327-1-philmd@linaro.org> References: <20260309145013.44327-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: 1773068021204158500 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 Message-Id: <20260307152635.83893-10-philmd@linaro.org> --- 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.53.0 From nobody Sat Apr 11 21:30:49 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=1773068008; cv=none; d=zohomail.com; s=zohoarc; b=nmK5Wd7ezNrqIvS1fxDNHdasEXZgwW7I/NObwWCyPWLMuJO0SE4rxIsqvHwICIphXHMMgGjFRdGFupIF6KZdSDLDHgfI3yzKtW4g+OZ+/2Tnk+Ajk/rjpS/87hSEyVVe9FseMtMEKWLLJHxzDtGdXhJKPtWhEvW63DKpP+SkUgU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773068008; 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=nFBD0qDRhedXBZOSg9THzlFQsk+WFfdCetsuF6KGnOc=; b=g66xEP6sKYZ5iByt+umAZKa93qIbOYpl5kJKXYUwZJmUyeVCUdI2Xq6YGODTeL2Cosb92gCii6BZAPX/wK3aw3q6Bi69HI251ubWwCHjXbMcgC3GxiS2H++MaEKd+U9hRjVMj5MlSixda++AKVp05J7CmWvq6klm/a6T5dIvKFI= 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 177306800804771.8762094379316; Mon, 9 Mar 2026 07:53:28 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzbyb-00060z-Sm; Mon, 09 Mar 2026 10:52:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vzbxC-0004Ml-GG for qemu-devel@nongnu.org; Mon, 09 Mar 2026 10:51:36 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vzbx9-0005mG-Pc for qemu-devel@nongnu.org; Mon, 09 Mar 2026 10:51:29 -0400 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-4852e09e23dso18591655e9.0 for ; Mon, 09 Mar 2026 07:51:27 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48527681e2bsm265186225e9.5.2026.03.09.07.51.24 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 09 Mar 2026 07:51:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773067886; x=1773672686; 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=nFBD0qDRhedXBZOSg9THzlFQsk+WFfdCetsuF6KGnOc=; b=AEg37BPFT/x1MbsaFLJcwmiTDCnQfa7dgdAJqjtGUnAWC0clok+AVZs5dHaNIbdeGr t/Bwe8p5nB+v5YLNTrYXrtWGcBPsel0YDC04k0ZHu5QCXOwpovvsvXkwEo1LDUC5vGEA hPPHnqrXVtiUyNih+dBflfQGlP49afXYJblrXRL9gONqjKYZ1ZANqTzsTLO3GuDhzrFz G6at3TLbDpCpY8JIND2R2Ux5nhYR+Oq2NFSetXbBTIwsqDdD9fQcPs95fYiZD+stUJ5A l1Ah/JKMKxSoNK0JRAnS/8uaq94yMy9wzNAJmVGOjShDnC/kEx/7D4xSeyAZg3RKT0uo IaJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773067886; x=1773672686; 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=nFBD0qDRhedXBZOSg9THzlFQsk+WFfdCetsuF6KGnOc=; b=O7mekDvIvtwrNN1yT1Rp6fQnx/6ym488Ljlio99+dS8eTx0e0PkmXxXgbW1wpJJoWq 1flnbKzwaOVSuN0synQSUjwbY3iDJ6JYb/Q2NHecXjfe9HgzgBYJK4KB75s+mbChieIk +CJN+iz0EwpJIBPRfmbAMfcUXNFB5+VjMfOItWYF0AiD0M89T/8uItzkt6DvABYxTs2Y u/vQ1CVlpQeA7R/FOxsSTprbZP8M3WQfUVnV2ldksii43szAL0pvBRBtjILJyXAbGL0j 31p5xL0XBknOxehYMp8FUFLTJXEhT7EZZz3oYSsbbC2q9jtJkRTjhJOk500xkY5DciiP 1dag== X-Gm-Message-State: AOJu0Yy/gZClWQ1RByWF5Y4OrKIYDGbk7+I396Yg/w5+sdpGCvSSo0Vs aSO9wv1eulbdzEc4pbIYB/INxJ00ThPIGUhkGAf9VzPzw+XMOOqbN3w2RhNqJCx9fY6IW7eKcOB +xpxt+rQ= X-Gm-Gg: ATEYQzyc8Mx/wmrcXbaK8TVcX86QK4oBPS1VyEs+HNgUw91GRCtBWFDhxGi5PoGAiYB giXL6pUzjI3VV2UsX5epRxtok8+05AlNOZ/0+QifEGrbpxA0q0s8+5ljIjclzxO9lSFGwyvX1Jc 6UelnEyFyDdgeCr+wdI+3uXNHAPmXEtjBs1LkmprPdq+83erBbpL91k6P7cXVabeN/8WyB+XfXa wGhLyNE74eorkqwGg7eSsubcnfLe4vK7yPLpyQdoBQlO4/7Ech2kmwZ1Ox2mGFSeQJlWqyf61Ye eiboKT+zZci3Wl6OKMa3bEf4UG6xXgN9+T8DNjGkzKUV+vFDhfRiwARJ/Mrt6JwOKj6aH46wbYY 1MlQSm5sjS2ymPS+IQQZTKc4USpXh03Ws0oNVrdvXb3gtdSkZHxOnJEeTzfowdVoTKIbH2g2MV4 zYqoWnBnlDnnSvN182naJnQEYYVI8cwskozS9D8oz4d2ijFDjRsEbhIrkdnWBiDqff21ujcrGvJ 3lGaA== X-Received: by 2002:a05:600c:350e:b0:485:17a7:ba0d with SMTP id 5b1f17b1804b1-485269785bamr190793715e9.32.1773067885916; Mon, 09 Mar 2026 07:51:25 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Zhao Liu , Yi Liu , Paolo Bonzini , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Michael S. Tsirkin" , Igor Mammedov , Ani Sinha , Richard Henderson , Eduardo Habkost , Marcel Apfelbaum , Stefan Berger Subject: [PATCH v2 10/10] hw/tpm: Remove CRBState::ppi_enabled field Date: Mon, 9 Mar 2026 15:50:12 +0100 Message-ID: <20260309145013.44327-11-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260309145013.44327-1-philmd@linaro.org> References: <20260309145013.44327-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::336; envelope-from=philmd@linaro.org; helo=mail-wm1-x336.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: 1773068010481154100 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: Thomas Huth Message-Id: <20260307152635.83893-11-philmd@linaro.org> --- 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.53.0