From patchwork Thu May 1 18:36:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 886356 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp463704wrq; Thu, 1 May 2025 11:39:05 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXtrPJaGlUQ6yaixo+RfaJLsPXhD/jKN1HK45XpBfwkE4xt1BGQ6T5a03v3wDjsveG4Vv8ZrA==@linaro.org X-Google-Smtp-Source: AGHT+IHt/mSqCPsWotYqeT4nht5RyXi6+ZPee3zANhgWupSOj5a+B5R0X1PpHNJMYWsBDpXFGu5O X-Received: by 2002:a05:620a:2682:b0:7c7:9a1d:ecde with SMTP id af79cd13be357-7cad5b23818mr25676585a.8.1746124745639; Thu, 01 May 2025 11:39:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746124745; cv=none; d=google.com; s=arc-20240605; b=Azys6J6IDfGS7V+s13N0qJ9KSl7Lsn8u4RF9zTAstrj79PgcCHn9LtsAWSi6qYE6NI acoDnUdKmwaa+kFQEn/cRtfsGCQXu5Gda86c2f4QlDzrUn/XzitoIBYQXd3wXeyHyNnh 9NOBa9wvh+kW++cgSIzM3wTaUj6ceEsmblHxAzcWm3k3PZzNAmPS/z7S4vqcMtIb7rGG bj3C0ZOFveCpcZTsN5+f9/0aoSbtgnIXx8h9gVRdYrMdosb562L7JUIOej2uoKypMij1 GiGaPvU5LjKl8hz8mDDje5yyDDwZAPEqtJrje32IhF9OFq/2HV00v0WDvSCdHjgHwNXF ni/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Tug16kX0HED2B7MwReNyhMxMcx758vAMRXpHEaxoLXs=; fh=hoe06aprcDnk5P3d0vwgQt6uC5al0E2l9mfTIGTxZjA=; b=kh8+Y84Nmq0w6wK8mvpb/Ua7c4oqDR31GCn53Cg8h9Ez0DWoRv2dS0dAwnn1W/KvWw Zw7H5YfVmApIbGy1SkKMEcnT42GSErVcoew4jbfy366ti+C9vF2LSiZFh3AgfmO2gLfv YlC10DCCAOph9ABtVlc6ntUWAnizbPXc19Ve2U+HeZWrV3CSVq/x0zSdLeIcOWujvZON qlVPN40g46//nusAsMUi1eQXIE8wNNkxNJ/ZqYkayh9jTg5cy/j1ENjFnsGFN5bHPkYX CbRldyDxldTy7mieb9mEdf4KAmQY+AuXyUnyrpnCv5vX0FN2G9jzKx/NwLbmzSks+z5R 55jQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=r2z6ks27; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7cad23b9db7si130240285a.110.2025.05.01.11.39.05 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 01 May 2025 11:39:05 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=r2z6ks27; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uAYng-0001yE-5X; Thu, 01 May 2025 14:38:24 -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 1uAYn7-0000Ar-QU for qemu-devel@nongnu.org; Thu, 01 May 2025 14:37:51 -0400 Received: from mail-io1-xd34.google.com ([2607:f8b0:4864:20::d34]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uAYn6-00089d-1y for qemu-devel@nongnu.org; Thu, 01 May 2025 14:37:49 -0400 Received: by mail-io1-xd34.google.com with SMTP id ca18e2360f4ac-85e15dc8035so45428839f.0 for ; Thu, 01 May 2025 11:37:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746124666; x=1746729466; 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=Tug16kX0HED2B7MwReNyhMxMcx758vAMRXpHEaxoLXs=; b=r2z6ks27SK4Q1t+i4QjMnyAA1bSf+mM1rUb72C1Htf2XZo2Vc82Cz5rMNvHloN1IA/ kDEJ9pud/uxO/lBTJYnfbhp7aQPz8tWHEOsPjio6EBGUE/2bK9YNPfLHZ/j2myPB1lkS BTSMZqMs22wIAQOGJKRPe5rEjmBG3FFM9f46RaWyIy/OJ5hhYVq8KXmCHiGyksh/uznd 9v+kgQVcjJmgHSepTeGMPwcqgLSweQDGtZzI9qPNq1vNh0/omWWvEamE7SKkK64kuCTs ZSHV3qeKwSCExbWs9iQXn3MZpvqdkD1Whear97EqlA6eApImLHl3Z/QXZQwsFUzs809h PhKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746124666; x=1746729466; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Tug16kX0HED2B7MwReNyhMxMcx758vAMRXpHEaxoLXs=; b=fUcI2LM9NHV9hvBupkfPM/4q+5vlgjoTQ1EVYpZ4KH2ry5J7xq+vDtao9OY6UxPfpC xWdEHSu2xNedNohq11uAxRetfbBBYu7kuPmwcuHaIoW/RqI7sAA0oUnNpwEeX9HElNVC sFuDKf6F7YZuE+DAW5LkMjefVa57NpQGLvS5IkdvTNeFGkSYeWTq6xk1TTNWDwtru0KF RQLsCKvJO1hCHLe3q2+4pq4RAI9tZE/IS+59U+XkRnE/Jtd/DnAN85I01L2poom61jLw z3T+mkeiEDLhQZNsdyuVkoL5BcMjqgqnMgPSF2Q6maPTwg2n7VpNWmzAwTeQD8rxgKrk rkWg== X-Gm-Message-State: AOJu0YyGoFCJMraIYx2pHhTfIjhqUEO15vHUDrl88P1ioQyaTKmL39rF BczU5AsBmpfccnE8Jib2BxD04nigWruww/B4al9nTMSLUep+cTpZt2lt9RYRXqSHlEmty9vcbJ/ P X-Gm-Gg: ASbGncvFyLoViAznEJ2Gl8FKUAhhmkyE/ROaE7Z/wvEwqL6Nb7lmFygZlNZ1hC2Ds1y wGOre6luujO9ysaDlkKtSwAhqsGvwp42avHGlUyWqkom7VyMZIdsyLzOAVkegx+4sb+5hCQ59Pu ZYSQqbrlIQEQxr3MMtpsLJrlWjl0LAxgx4WHJWdNW3mBoddaT4ISn7fI038erYq6Qo5U+QpY3Qy SXsZ816ZACb/9cfx/Gf+1Gl2RVpFqfNe6T7hM3TNO4OEdOIMQD8t48xWtCR1UmNsxvx/R1mMg98 jCl/sie+0hj4ou12AHrF3I8vzHplSU5a0bK1Hs0ruWeDLHmRV7l1uwfgtzaDbxeV7aQGnfR66Cc F5hSURAcksrEAsdaR3pkh X-Received: by 2002:a05:6602:4a08:b0:861:6f49:626 with SMTP id ca18e2360f4ac-8669f9adb4dmr38788439f.6.1746124666305; Thu, 01 May 2025 11:37:46 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4f882fc9af6sm293583173.100.2025.05.01.11.37.42 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 01 May 2025 11:37:45 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Igor Mammedov , Gerd Hoffmann , =?utf-8?q?Cl=C3=A9ment_Mathieu--Drif?= , Yi Liu , Paolo Bonzini , Amit Shah , Zhao Liu , "Michael S. Tsirkin" , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Richard Henderson , Sergio Lopez , Laurent Vivier , Jason Wang , Eduardo Habkost , Yanan Wang , Marcel Apfelbaum , Ani Sinha , Thomas Huth Subject: [PATCH v2 08/16] hw/i386/pc: Remove deprecated pc-q35-2.7 and pc-i440fx-2.7 machines Date: Thu, 1 May 2025 20:36:20 +0200 Message-ID: <20250501183628.87479-9-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250501183628.87479-1-philmd@linaro.org> References: <20250501183628.87479-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::d34; envelope-from=philmd@linaro.org; helo=mail-io1-xd34.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org These machines has been supported for a period of more than 6 years. According to our versioned machine support policy (see commit ce80c4fa6ff "docs: document special exception for machine type deprecation & removal") they can now be removed. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Mark Cave-Ayland Reviewed-by: Thomas Huth --- hw/i386/pc_piix.c | 9 --------- hw/i386/pc_q35.c | 10 ---------- 2 files changed, 19 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 98a118fd4a0..98bd8d0e67b 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -755,15 +755,6 @@ static void pc_i440fx_machine_2_8_options(MachineClass *m) DEFINE_I440FX_MACHINE(2, 8); -static void pc_i440fx_machine_2_7_options(MachineClass *m) -{ - pc_i440fx_machine_2_8_options(m); - compat_props_add(m->compat_props, hw_compat_2_7, hw_compat_2_7_len); - compat_props_add(m->compat_props, pc_compat_2_7, pc_compat_2_7_len); -} - -DEFINE_I440FX_MACHINE(2, 7); - #ifdef CONFIG_ISAPC static void isapc_machine_options(MachineClass *m) { diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index b7ffb5f1216..a1f46cd8f03 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -648,13 +648,3 @@ static void pc_q35_machine_2_8_options(MachineClass *m) } DEFINE_Q35_MACHINE(2, 8); - -static void pc_q35_machine_2_7_options(MachineClass *m) -{ - pc_q35_machine_2_8_options(m); - m->max_cpus = 255; - compat_props_add(m->compat_props, hw_compat_2_7, hw_compat_2_7_len); - compat_props_add(m->compat_props, pc_compat_2_7, pc_compat_2_7_len); -} - -DEFINE_Q35_MACHINE(2, 7);