From nobody Mon Apr 13 10:53:36 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1772895708; cv=none; d=zohomail.com; s=zohoarc; b=e19yUAyVqGFoTlaNsG5bz/UjXY7970FjzQX2+sUiWeuI2P6Nc21Wc6X3Np4dmq4sGEsgiLvtOLbuLRJ5m0vj+TXuMiM5lczi69OH8f3871zBFmSivlbaYMA8zX3hg0TbCGFKfx+xfKgajZoSF3IhyBCRc/RgijLnS7qQppCDUOA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772895708; 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=EoM27mpvLD+kD5h2ebJHgBOSBD0IZgVkj+2pZeVCMbg=; b=V0xfTt9Xo9o40YSC85KLzmEYHA+7oOKmoTcxEvzVs6fP0BqOA6LGOozzCWNRChHQU7Cext2/BHXzlwdZQM07AhvD40Huo8OAwkS5yqqtmFeekG06ZVC5kESN+wU2hJ97sjFnJL19zQh1om4iZPr3ilOZs5lOAXaN4tyLTGkhBVk= 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 1772895708055332.21229520331974; Sat, 7 Mar 2026 07:01:48 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vyt9T-0005Ko-5i; Sat, 07 Mar 2026 10:01:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vyt9F-0005IE-Ry for qemu-devel@nongnu.org; Sat, 07 Mar 2026 10:01:01 -0500 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vyt9C-000548-Fh for qemu-devel@nongnu.org; Sat, 07 Mar 2026 10:00:56 -0500 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-483487335c2so85432055e9.2 for ; Sat, 07 Mar 2026 07:00:53 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48527686bcesm188751675e9.7.2026.03.07.07.00.50 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 07 Mar 2026 07:00:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1772895652; x=1773500452; 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=EoM27mpvLD+kD5h2ebJHgBOSBD0IZgVkj+2pZeVCMbg=; b=KgZNKTt3eyen+WZIx3lP1foCiga3qHeV8OSPDoIv7yd/SvunrYy4qPr//90VuFfPtg MiimZvmmK+HkHajQ/sU+yulSdLJCkOI/InQGFIDxZdTQaWCKcO80fx2QxGr1mjiCShrp 2gd2VhBXVUhyzm1x2SiOb0u97nrqjXxc3k4SD+mFkoqa988mbqeT+INRueyXrgmjF6ah 0yjfRTEEiaC1SD96V4UsIhEK/d5vN+UmxLM+yryYSsTmF4K0sqrX2pCueYVdTUzrq6LH WgruJhmfeYZ9yc+Kac/1cQYsVL63bPG2sst2ijCR0Vh2tkasEnpevj/JYK2sLDNx5LVj pDZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772895652; x=1773500452; 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=EoM27mpvLD+kD5h2ebJHgBOSBD0IZgVkj+2pZeVCMbg=; b=qqHpGmxScdZAYkgxdU7kF9DimboaSCAnlFzVCcKGUk2YwHvudTZk4xwRY1Sgo5ZDb9 GyulxRYaxRCFEbGwN8QnicxXtAe+Q8ITZmdDlCyqJsSimXMEMfOdGoiNgVbLZy4+BvMm UH0mIZeVCHDPxFP929v90/b6OFc/DT2D6GTIpXNqy8aN7Zr+8twQVSkHvrW4gkkQlMAo NMZk/CQqOfXXPZRAAv3X4TV0VVw4Dz/Ha8GZ/eMsgKMH0oUZ+7QD5z75dU1r1tNAltJc AIfibnOGW638JAeRYUaDz10sWcrc6hzpMSj1Ek4r1FUd6850uZ59pWGC5/lb8iN32LDS nIpw== X-Gm-Message-State: AOJu0Yxqqiz+nIYkvg9qxkM5pvplAkbg8sIpqZqIqolTkpJyFS92zYHj mBhAZUzJO/ADDAx8mgPPWfzzcICDvJk46pkYpuarEdQiLs0FQM2LZ4xSHuO5JpvDcLqptC8WmQI OnmZY0Ro= X-Gm-Gg: ATEYQzzRRi1HDcp1QqfE6k0dphk5AFQiKbmSGNqYYGxkTfwhmFMaBkDTrTjUKiFZBeG JQ3XAcIHY1N+rpY1EoF+tzPgu1mNxyKo2Q0pKhSgD6cOMbokKx6myuaa+dqua8Dru1Zo7ghEUsX fGnlTil0z24lohrSbtS8Wj9P0+MQ0Dt1Br10F8HwhVT5tq73VUCjhDXEmGMpY3hh7KiWB1winIy /mwtolHNLRhEy+vXfDMMYYFaFcussJVxDorWYoOyd5Fvwla/W5+4aSoBoLXIxVzDUnjlzyMpVhe nqbEhaU6CON5kfuwYJGy/K2hnSWUbXiYTXtbzFgoy9G6tqoq4YEAlybS4QvTSft889GhSvSwf9w 5mOOea+Gp3IYjZ2bTk6agulNwBEOZKdfFgoKDCFvwWxWCb3ALGPw+ppbGIWu3BwExUR4xtFJ9wl xQO3Vghl1ZsNBc9JSsVeFI+Yp8ZERIlYsj6jSRtzTAXytDuKRUaaw2Kp7n/1xLKeauZAN/CB/p X-Received: by 2002:a05:600c:1e85:b0:483:8062:b2f with SMTP id 5b1f17b1804b1-4852691c657mr97647775e9.6.1772895651592; Sat, 07 Mar 2026 07:00:51 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: "Michael S. Tsirkin" , Paolo Bonzini , Zhao Liu , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth , Marcelo Tosatti , Richard Henderson , Eduardo Habkost , Marcel Apfelbaum Subject: [PATCH 1/4] hw/i386/pc: Remove deprecated pc-q35-3.0 and pc-i440fx-3.0 machines Date: Sat, 7 Mar 2026 16:00:39 +0100 Message-ID: <20260307150042.78030-2-philmd@linaro.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260307150042.78030-1-philmd@linaro.org> References: <20260307150042.78030-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=philmd@linaro.org; helo=mail-wm1-x331.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1772895710035154100 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 Reviewed-by: Zhao Liu --- hw/i386/pc_piix.c | 9 --------- hw/i386/pc_q35.c | 9 --------- 2 files changed, 18 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 961432176cf..29c8e997131 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -668,15 +668,6 @@ static void pc_i440fx_machine_3_1_options(MachineClass= *m) =20 DEFINE_I440FX_MACHINE(3, 1); =20 -static void pc_i440fx_machine_3_0_options(MachineClass *m) -{ - pc_i440fx_machine_3_1_options(m); - compat_props_add(m->compat_props, hw_compat_3_0, hw_compat_3_0_len); - compat_props_add(m->compat_props, pc_compat_3_0, pc_compat_3_0_len); -} - -DEFINE_I440FX_MACHINE(3, 0); - #ifdef CONFIG_XEN static void xenfv_machine_4_2_options(MachineClass *m) { diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 261d759a223..f102da8e4a1 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -614,12 +614,3 @@ static void pc_q35_machine_3_1_options(MachineClass *m) } =20 DEFINE_Q35_MACHINE(3, 1); - -static void pc_q35_machine_3_0_options(MachineClass *m) -{ - pc_q35_machine_3_1_options(m); - compat_props_add(m->compat_props, hw_compat_3_0, hw_compat_3_0_len); - compat_props_add(m->compat_props, pc_compat_3_0, pc_compat_3_0_len); -} - -DEFINE_Q35_MACHINE(3, 0); --=20 2.52.0 From nobody Mon Apr 13 10:53:36 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1772895721; cv=none; d=zohomail.com; s=zohoarc; b=m8i97opEOFHWLXPLYtfAXEWeLcrVp3IdX9RlSbOzpSfs6t1LptK7q8WZyQ9ovdug3x3lZ6KKoA/AmWScQeLV0yKu0oWfwITUeYZ46g2GM5SV83XZPsezxxtgNQ0/9W4A3uwdzIi63t4JI4C5/IDGtLzriPURnf2Grv35R+NIp3s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772895721; 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=dwHYmSLMbr6lHxtZHMQFJ29WCkaScZo0cizYELOiaa4=; b=R3+z6IjjdWEJ2hSYNcKw865vwkzm+/+cMJnjtzHGIsAm7Rxt7+X0f6rCZ9pGUv0N5AVF+r7obEhxigOxF5YyW44ocsvOSIDP3sz6oX9WjR8yuqeOhG16tJP9wxbTD6qijTky8NKzzzMitPBovxEAQGJBV+rE9+4Z5gi2ZCobh8A= 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 1772895721028807.6522831203982; Sat, 7 Mar 2026 07:02:01 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vyt9W-0005Ro-FX; Sat, 07 Mar 2026 10:01:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vyt9K-0005KK-4K for qemu-devel@nongnu.org; Sat, 07 Mar 2026 10:01:02 -0500 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 1vyt9I-00054k-M2 for qemu-devel@nongnu.org; Sat, 07 Mar 2026 10:01:01 -0500 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-48370174e18so62337775e9.2 for ; Sat, 07 Mar 2026 07:01:00 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-485307fcee8sm11052465e9.21.2026.03.07.07.00.57 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 07 Mar 2026 07:00:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1772895659; x=1773500459; 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=dwHYmSLMbr6lHxtZHMQFJ29WCkaScZo0cizYELOiaa4=; b=soZ+hS7uA6ak0fNRn8HPJh4BSYYY8zun28K2U86rbnwv9k7LLXv3ppJBnGj6Dx4Ii4 rU1BZyQBxbdu/ZtsRvq8UVuver3QWVR7k8ToebtCbZqkwQexTGltHxk/TADij+rW2Swz uGw8z39KFoLE6GzoZWDmXyuXnEmPkxZ8/ymBQmF7Hf1jct9aSNf8QpkuaKfW0/fM8G9b Shzclz/Nc2CEFBlZypBV/CYVSGs4sfptiCO8AAlI/CLUHwBRBBLsPwW8N1S+Z2MvIWc9 Aqp1f9LA863iAyRRvU6iJmH10rlVxIC+xeX5RJ2gV/TqocYNoWQnYjSFpR/JmhZlAqTz yOpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772895659; x=1773500459; 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=dwHYmSLMbr6lHxtZHMQFJ29WCkaScZo0cizYELOiaa4=; b=p/v58e4f21OLgM4FP6i2Ud+FNp8aSOwMIrR5y81Ir0u8phcXXTBErxRWhHcOZkdZf/ MNKxr9BjxamqpGjV5tu9YUAu6UT9MKgF9BJgUvFJDuwK6EPBShXcQtHsi5T6qEbGdxyh jILNaTgkugI2Y/FuULIfyOr1TJtIqqDIhyIBjL3WIpINVOpqHywN9/Ue/OTsL9YtIUHO bif3ew+ePFLsdMMK8KDCwNpK7QCov20c5arpxGMQTvyDD9lHMGQ6OKZ2sVwy1ajdlp4l ZKKuZepoJOdQdOvADbdkFNV/XlquII7I6Cj6odEk1romRsTYrJf9yGb3ajb6hmkNJJnP Xf0Q== X-Gm-Message-State: AOJu0YygbJule5eYqOXz+zoAOsr9ornQYUa8LxkA2woPsI63xscryoCv ILgbkcsHgzGGXk7hr6yaDQh6Y4AVcP21WC2irZrH0KdlVIQj5uYu7k68O4zhr7C0p1nRLJ4S4Iy xC7DvIWM= X-Gm-Gg: ATEYQzxfKIxwAqkUOPhgw/lVXnG9QTA7dHAgLBydJOqU2BfAX1mXQukfWXcmEyoacuo PNRtwNAc2DrMKF0XiiA5B2I1PIOeNC5gPw8Z/LcW+l2b4e+6JgrL3fPZvreOhaT/MzIovAP11ld vt0gl4sM1zPdkWzBxAacgDpo2vkNbHenpoE7BQP12RW3mfQTrN6VH8K0lNsXzbPLSNvMD6vhnKj bGB6aBTer387ceG2RIyC9at5XbImI9s6GTgrtJ8k1/ZZaPaKTsgUK0kP+sbrYu3VRPlbblGSwV/ KOdrT3a7U4h39aNfH0RDJQd0coHBT/7fFlyMSM1uAarPfWeYA+tC1vFFny+FrmAJgbKyu6ECv2/ 94ut51eW+eCbAwmnK5RUjGN3tFs1Jl5cK57GxJIOrz7jVZFDcZUxwkpUtZFdTH+i7rKTqEYleFZ 2JSfrxJ7PUW+c55/n7SiZWvcJEGtEE9/iTKZ2hULDT2JHOgxVX1Jp0Ax5VjUJJ0Xsn9VGOMSmr X-Received: by 2002:a05:600c:3b04:b0:483:71f7:2796 with SMTP id 5b1f17b1804b1-48526923e1amr94406945e9.10.1772895658629; Sat, 07 Mar 2026 07:00:58 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: "Michael S. Tsirkin" , Paolo Bonzini , Zhao Liu , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth , Marcelo Tosatti , Richard Henderson , Eduardo Habkost , Marcel Apfelbaum Subject: [PATCH 2/4] hw/i386/pc: Remove pc_compat_3_0[] array Date: Sat, 7 Mar 2026 16:00:40 +0100 Message-ID: <20260307150042.78030-3-philmd@linaro.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260307150042.78030-1-philmd@linaro.org> References: <20260307150042.78030-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: 1772895722049154100 The pc_compat_3_0[] array was only used by the pc-q35-3.0 and pc-i440fx-3.0 machines, which got removed. Remove it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth Reviewed-by: Zhao Liu --- include/hw/i386/pc.h | 3 --- hw/i386/pc.c | 7 ------- 2 files changed, 10 deletions(-) diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 113813c07d7..5623660f5dd 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -277,9 +277,6 @@ extern const size_t pc_compat_4_0_len; extern GlobalProperty pc_compat_3_1[]; extern const size_t pc_compat_3_1_len; =20 -extern GlobalProperty pc_compat_3_0[]; -extern const size_t pc_compat_3_0_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 819e729a6e3..a38634e3577 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -214,13 +214,6 @@ GlobalProperty pc_compat_3_1[] =3D { }; const size_t pc_compat_3_1_len =3D G_N_ELEMENTS(pc_compat_3_1); =20 -GlobalProperty pc_compat_3_0[] =3D { - { TYPE_X86_CPU, "x-hv-synic-kvm-only", "on" }, - { "Skylake-Server" "-" TYPE_X86_CPU, "pku", "off" }, - { "Skylake-Server-IBRS" "-" TYPE_X86_CPU, "pku", "off" }, -}; -const size_t pc_compat_3_0_len =3D G_N_ELEMENTS(pc_compat_3_0); - /* * @PC_FW_DATA: * Size of the chunk of memory at the top of RAM for the BIOS ACPI tables --=20 2.52.0 From nobody Mon Apr 13 10:53:36 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1772895724; cv=none; d=zohomail.com; s=zohoarc; b=oFs+hEvGG5mqj1yjjrx2cFkckK30HBeCakoFlxmGISRNy4RzdZgR4Do+Vr+n8s6zsfGrK+v+aiZ9tQCbtI0jcYPMJuwZxU0aQS3yP51UhnOI6jUPcHrqN75aQ85C2su/GKjQJ10Qr3uSaNGkkKBcE3/KK+03aL+CJmZdCZaI9+U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772895724; 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=Gcg/exchlRz2hW0LJ3FgJGNryHP56rv8IoAX8A7KL5Q=; b=i9JOUFK+L1UXZpxt7zBwyOJSPNGgwd34UXSB9uyGoA7UkkK2Zs9Wo9QY3V7kAQ0lJZ8ULJSYsGvd9NvdZLW1wkHXWsLa3heypEoclL4VVKzDsFRbRrv+qTBz7h4zbm4qZrmzsjaS9ZHgdDDzttX8aHuqxetYOiZeCnDFlcOADy0= 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 1772895724019633.5041973373076; Sat, 7 Mar 2026 07:02:04 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vyt9Y-0005V9-EO; Sat, 07 Mar 2026 10:01:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vyt9W-0005SC-IX for qemu-devel@nongnu.org; Sat, 07 Mar 2026 10:01:14 -0500 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vyt9U-00055G-5j for qemu-devel@nongnu.org; Sat, 07 Mar 2026 10:01:14 -0500 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-48336a6e932so65994135e9.3 for ; Sat, 07 Mar 2026 07:01:07 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4851fa87e56sm190814005e9.0.2026.03.07.07.01.04 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 07 Mar 2026 07:01:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1772895666; x=1773500466; 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=Gcg/exchlRz2hW0LJ3FgJGNryHP56rv8IoAX8A7KL5Q=; b=O7LUmdVkFQFY9nAweepQvRnVAh2PUYPujDyf9F5zBFCO1bwTdrFo4lXewl8cv3lVaE Vq6Id+fJ2NzI/OJTODFj74aWIFHmQ9Z8iMkBeWJPDXTatR2IQqbez1TRyIydHzwIpSk4 JGeC3TpHoDmxqu9SXD/MwQZWSiew7P7n7YoeKU499HeycgDZ4f65VfZUetU0IavVZ/Y3 iEEs1LzTYQgowzlmebZSZmcGhhdZJqqPY4rOojb25PT2jjwqR00riqPOgNpdGyXuYTKh 5Ooj5SOamE33rtrTQZwf3Xtn5Hxa8vnhaNx46JF6b+yG6Vn+F2rtDgZLN+yMAevcfuP8 qdWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772895666; x=1773500466; 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=Gcg/exchlRz2hW0LJ3FgJGNryHP56rv8IoAX8A7KL5Q=; b=UXc/uFD0hmZwyOacGdUhIX0djffiSZhiUDD7JFeT3SUcmr7eTQc25IowhMkiN5zHub hf/gMJ8NO/7NzVYt+GegmHA0H4zxOEyxSoMU4Sw4pZf3moUcMIU20thCRN/B5owlev+q dL377aVXA+2H2wgoD32UFMXGtQlKY9EwciWUKnUm6Y29mfm8e5jqMu8E1TUmESBfkkCl qw3l0XSVYG2ygIkD/5LPzUsQvfmFRKXUUxzvL6DueM/3XGVBboOsGOBG6lVeiTx9utCX 7nsgGJ/qt5x/VED23zjWYXu/Lhof2sAZe3V101XUopan92mJGb5Saf+UxXCw+vgcx2yv WfcQ== X-Gm-Message-State: AOJu0YzIr7BnxepCUl9vw0SvH0ZSXzZgWoj16fT8z8xG9OZEMU7UQKZy Y5+5PXb5w9cGdOAGs7auVa70q04Gl+0NM6yDMgFrEIqprt4jAYdGucHSFLhdu5wDQcF8H+95DSG X93vw0fY= X-Gm-Gg: ATEYQzyB+rPGrB4B0KnJ3O56aQ8Ngsrwt+kSoqNOwD5WGrQMr70YXMjWlK7xIOiKICV KcnPn3jCymwN8YDBkKF1Gzg6FHhyXQBHwr5jX5l9iKl7I3dCP2FEGcLRK7RS+OEITExS7HeZLEM hn24KQYVJjlq1oX+Qvl50LaEsiXx5Lgr4Hsu6vYR0T15321wi7jMa43vefvqP1LTmFzC8qWTeA0 osTI+TA9xTclwz3XqJ7ea4TsmqZH5TnQfxrSreLmnlbSgFMC3atFGXXinoWlZUOSQkrBupVf1c1 ewhuUjtQ8tDGGXcXOtrFaL8yBhT+KC+a03f2/63upRNXbfoCMXjfwqvuRTKrAmcXk/cffi41pqw Al3CgTBRr37h3lzw+6tjNyvmZk8M4znOsxzMqM4KMRuP0XPt6Y2BChHtNDwfoPW6lL4wnYYRRYN /46dhvckx2UCgdwDls+H9iBtS4hWxUPBsjo+8xQQIJkURgnN9fZMqzOd3QTX0z/+70Y18znP9YU qmVvCqv7r4= X-Received: by 2002:a05:600c:8115:b0:477:a219:cdb7 with SMTP id 5b1f17b1804b1-485268bd69fmr99358265e9.0.1772895665487; Sat, 07 Mar 2026 07:01:05 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: "Michael S. Tsirkin" , Paolo Bonzini , Zhao Liu , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth , Marcelo Tosatti , kvm@vger.kernel.org Subject: [PATCH 3/4] target/i386/kvm: Remove X86CPU::hyperv_synic_kvm_only field Date: Sat, 7 Mar 2026 16:00:41 +0100 Message-ID: <20260307150042.78030-4-philmd@linaro.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260307150042.78030-1-philmd@linaro.org> References: <20260307150042.78030-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=philmd@linaro.org; helo=mail-wm1-x32d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1772895724948158500 The X86CPU::hyperv_synic_kvm_only boolean (see commit 9b4cf107b09 "hyperv: only add SynIC in compatible configurations") was only set in the pc_compat_3_0[] array, via the 'x-hv-synic-kvm-only=3Don' 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 Reviewed-by: Zhao Liu --- target/i386/cpu.h | 1 - target/i386/cpu.c | 2 -- target/i386/kvm/kvm.c | 15 ++++----------- 3 files changed, 4 insertions(+), 14 deletions(-) diff --git a/target/i386/cpu.h b/target/i386/cpu.h index f2679cc5b72..2b70d56e9b0 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -2335,7 +2335,6 @@ struct ArchCPU { =20 uint32_t hyperv_spinlock_attempts; char *hyperv_vendor; - bool hyperv_synic_kvm_only; uint64_t hyperv_features; bool hyperv_passthrough; OnOffAuto hyperv_no_nonarch_cs; diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 01b64940b17..c77addd2c25 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -10589,8 +10589,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-hv-synic-kvm-only", X86CPU, hyperv_synic_kvm_only, - false), 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), diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c index 27b1b848d6a..a29f757c168 100644 --- a/target/i386/kvm/kvm.c +++ b/target/i386/kvm/kvm.c @@ -1278,10 +1278,7 @@ static struct kvm_cpuid2 *get_supported_hv_cpuid_leg= acy(CPUState *cs) } =20 if (has_msr_hv_synic) { - unsigned int cap =3D cpu->hyperv_synic_kvm_only ? - KVM_CAP_HYPERV_SYNIC : KVM_CAP_HYPERV_SYNIC2; - - if (kvm_check_extension(cs->kvm_state, cap) > 0) { + if (kvm_check_extension(cs->kvm_state, KVM_CAP_HYPERV_SYNIC2) > 0)= { entry_feat->eax |=3D HV_SYNIC_AVAILABLE; } } @@ -1543,7 +1540,6 @@ bool kvm_hyperv_expand_features(X86CPU *cpu, Error **= errp) =20 /* Additional dependencies not covered by kvm_hyperv_properties[] */ if (hyperv_feat_enabled(cpu, HYPERV_FEAT_SYNIC) && - !cpu->hyperv_synic_kvm_only && !hyperv_feat_enabled(cpu, HYPERV_FEAT_VPINDEX)) { error_setg(errp, "Hyper-V %s requires Hyper-V %s", kvm_hyperv_properties[HYPERV_FEAT_SYNIC].desc, @@ -1608,8 +1604,7 @@ static int hyperv_fill_cpuids(CPUState *cs, c->eax |=3D HV_HYPERCALL_AVAILABLE; =20 /* SynIC and Vmbus devices require messages/signals hypercalls */ - if (hyperv_feat_enabled(cpu, HYPERV_FEAT_SYNIC) && - !cpu->hyperv_synic_kvm_only) { + if (hyperv_feat_enabled(cpu, HYPERV_FEAT_SYNIC)) { c->ebx |=3D HV_POST_MESSAGES | HV_SIGNAL_EVENTS; } =20 @@ -1752,16 +1747,14 @@ static int hyperv_init_vcpu(X86CPU *cpu) } =20 if (hyperv_feat_enabled(cpu, HYPERV_FEAT_SYNIC)) { - uint32_t synic_cap =3D cpu->hyperv_synic_kvm_only ? - KVM_CAP_HYPERV_SYNIC : KVM_CAP_HYPERV_SYNIC2; - ret =3D kvm_vcpu_enable_cap(cs, synic_cap, 0); + ret =3D kvm_vcpu_enable_cap(cs, KVM_CAP_HYPERV_SYNIC2, 0); if (ret < 0) { error_report("failed to turn on HyperV SynIC in KVM: %s", strerror(-ret)); return ret; } =20 - if (!cpu->hyperv_synic_kvm_only && !hyperv_is_synic_enabled()) { + if (!hyperv_is_synic_enabled()) { ret =3D hyperv_x86_synic_add(cpu); if (ret < 0) { error_report("failed to create HyperV SynIC: %s", --=20 2.52.0 From nobody Mon Apr 13 10:53:36 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1772895693; cv=none; d=zohomail.com; s=zohoarc; b=cS1pQUbbbgn+9DpIz4m0sYyhPZk/2ZGJbVcZ1EwjCxLSIOWf6+TTyRCvzmoK72CytWlVKRy/+N0B+SxuDr/BNt5FY6V2sbeedZyWWsE2A6wTaExQdb9DNqO9ladLZyhwhGcxT1fbpOZO+2CsyucWpCVofF/ZStf8AW3BkosLn/c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772895693; 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=yRgRoHeUJTr2eQRQbNrrHWjkqXp6I7X3mPegDHiCiNk=; b=gj1d1WCjP5Cgt0xt8zkJ24EqDmlWJg91E6fcS2nVj/qhNzJb5uFTkSqo1udDBnNkth0eCt92dIOf3BhRh38XyqCukZ0wwlGRFWsAjHm0CW+E3/aHHq/91j/W7TRugMM/+ffXn5rEipIKKczKCw6tMboYUvYmZ/C25b+aKTEAQ4k= 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 177289569363354.41240606448821; Sat, 7 Mar 2026 07:01:33 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vyt9d-0005Wl-2H; Sat, 07 Mar 2026 10:01:21 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vyt9b-0005Wa-Er for qemu-devel@nongnu.org; Sat, 07 Mar 2026 10:01:19 -0500 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 1vyt9W-00055c-AC for qemu-devel@nongnu.org; Sat, 07 Mar 2026 10:01:16 -0500 Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-439b9b190easo4364183f8f.2 for ; Sat, 07 Mar 2026 07:01:13 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-439dae2b9d8sm12300679f8f.21.2026.03.07.07.01.11 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 07 Mar 2026 07:01:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1772895672; x=1773500472; 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=yRgRoHeUJTr2eQRQbNrrHWjkqXp6I7X3mPegDHiCiNk=; b=JDqbOF+AN4DJLTNpF1xbIhZpB3Z93Dz5ILKxqjgPBifyv+c0lq5L5p2c/zCt5GWErA oP/lIkV/zIMtHQUM96Rt310KdwSfEhkT1tydNUi8anF0SkHa6/GJB8+5DzDMz3v6rGI4 VgSzB0DfWJU1rNeQ0tvJ2AStdyS1EM5lji5sohXgf4azB14Wa5aAEBAW/38zEcSr9Ego ml5QyMaRYpOa/dt83+FVrwA3tK9L95CfTjC3yWgqsZTQfdDcWIT1FZXSdWjywNqLpmrj WBttzdYimB4OlBWr55p9TE9AR4GNLUl/cnX4TwYDiNXCHIdPkm/0FvAwzqvs1F4BVdsr K/Uw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772895672; x=1773500472; 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=yRgRoHeUJTr2eQRQbNrrHWjkqXp6I7X3mPegDHiCiNk=; b=UQpMU+JJwhD78iO4S4YULQo3jK3FjWIsnelxghni0MZyOu+CdMPZdsoHyNFc4TOp8z a0gB0Zrxq/HFc4dEy+qoOLfsOtagFFNaowIUzMklkQcVihXXzHYBgPJPI/croYsLmO0F 60P/gda4b2ro2uGCpBekQriQKTrfjm5c1a7ePBX2zH/0fNK8/YpUFWF/odqjDX0fhGMA 9XuHEdY/6UK47yznX5ad59mJrX3A1qKdO9wNg22KpgpfLF5U72NY9XNs8yDJfeRlSxEy lyQvPCpBE8I0QW+8ZlrpE0N0IhASeXoQqRBbcPX07M6JnVKnnKwm1nzDBi7MzBlMBUE1 bCBQ== X-Gm-Message-State: AOJu0YzhdaHVVGh5XM1b620CkEIOQ/2Dx4oI4gl4DWyhnwMaLVXFxc+i lGmYK9+IeICCVnR6WA3kKdbxdGi6FHv2V/+P/BuDsg9nYz7cVkUWVwmg34vzI6kuiXtOwc9vIQV Whcx4HZ0= X-Gm-Gg: ATEYQzwlkD3JS+yom1fJTVXX6d4yPQZG0hx8w8pTTU1LyxcjQ2t0tSTf7Wgtz+dgJek 2i9am1HbMq2v1PVy1nmsXub3VI8DBIhZNHl89i53RqHSkefQLMan/cfB2DZL0Ov/f/qz3jBjO6A U6EXww4FCoRVEAnAnqtSbAh09J8AiihjDbD5HkPOLFuA4JxsOiLn98NeQZgjg1uj1m1S6VQORNQ K7DuBjDESiZMG69t33JTw/YPyTS18JREXJEYjtVe+GHyOGa3MQotOLyBTICTV4xinihtNhNpjRO 6wFp/RSXT1ai5ZJ6YVjjoP+uhJyPf/v20znMYdZ9qwwmZ4M4W3UAeLzq5CAAIaPvVse5Zdhk186 Ko4JFx+38b7i3p55L4c+n19Zu6koqZdZ2H/51/anu+FcORQ3N5M0s8YW/B6MMoJjUZWQs2JPngy 6bUI+gofILy8o9FMzeYaUV0d2eWwod1klJ/ZaMduuFZGbooha92WHsq+31A6Occ+GZlOVKeBcF X-Received: by 2002:a05:6000:430e:b0:439:af0e:57a6 with SMTP id ffacd0b85a97d-439da66a2f0mr10242842f8f.36.1772895672488; Sat, 07 Mar 2026 07:01:12 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: "Michael S. Tsirkin" , Paolo Bonzini , Zhao Liu , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth , Marcelo Tosatti , Eduardo Habkost , Marcel Apfelbaum , Yanan Wang Subject: [PATCH 4/4] hw/core/machine: Remove the hw_compat_3_0[] array Date: Sat, 7 Mar 2026 16:00:42 +0100 Message-ID: <20260307150042.78030-5-philmd@linaro.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260307150042.78030-1-philmd@linaro.org> References: <20260307150042.78030-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: 1772895695627154100 The hw_compat_3_0[] array was only used by the pc-q35-3.0 and pc-i440fx-3.0 machines, which got removed. Remove it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth Reviewed-by: Zhao Liu --- include/hw/core/boards.h | 3 --- hw/core/machine.c | 3 --- 2 files changed, 6 deletions(-) diff --git a/include/hw/core/boards.h b/include/hw/core/boards.h index f4ee68bbea5..9ad2a7d5c97 100644 --- a/include/hw/core/boards.h +++ b/include/hw/core/boards.h @@ -871,7 +871,4 @@ extern const size_t hw_compat_4_0_len; extern GlobalProperty hw_compat_3_1[]; extern const size_t hw_compat_3_1_len; =20 -extern GlobalProperty hw_compat_3_0[]; -extern const size_t hw_compat_3_0_len; - #endif diff --git a/hw/core/machine.c b/hw/core/machine.c index 4770618b559..162600425b0 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -238,9 +238,6 @@ GlobalProperty hw_compat_3_1[] =3D { }; const size_t hw_compat_3_1_len =3D G_N_ELEMENTS(hw_compat_3_1); =20 -GlobalProperty hw_compat_3_0[] =3D {}; -const size_t hw_compat_3_0_len =3D G_N_ELEMENTS(hw_compat_3_0); - MachineState *current_machine; =20 static char *machine_get_kernel(Object *obj, Error **errp) --=20 2.52.0