From nobody Sat Apr 11 23:03:25 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1772708064; cv=none; d=zohomail.com; s=zohoarc; b=nkPxRIOSMOT8TySCeWPkWxAEbvsVtSEHXfy5wrksZp99Wk5QO5kV4x8637oC8pm2MFqKL4yPXCOqmCvfVN9vWQ2HywFXqXOIuqjBkpDIVyzUbiO7L1qBL5XHDaj8IYyucJWog1rObt2Se3aXazVZAZ5cIxsnbZCuKFPsktLzIYk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772708064; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=UF6Dso2itn/3ESk+NM4HgSMdzC4V7xHqiWg2my0AHdc=; b=lX0zDgCzALccwNKOpNm05V6K5ubQyMIyrsJQbWT+H/w+xs3KdUFYntD122n/FrgzhHfDBr28G/+4iBdIy6TiN36PRapZn7TiCE7rC/EHg4lP6Z/sa5F+/j9wADxObC/uJ4ghGBbo2w9Psp8DgbwQSQQRKjCLOv5OJbPdH5bzKpk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772708064256891.4734306952723; Thu, 5 Mar 2026 02:54:24 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vy6Ke-0002d0-J4; Thu, 05 Mar 2026 05:53:28 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vy6Kd-0002Qm-3G for qemu-devel@nongnu.org; Thu, 05 Mar 2026 05:53:27 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vy6Kb-0005Yw-Je for qemu-devel@nongnu.org; Thu, 05 Mar 2026 05:53:26 -0500 Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-663-CnmvxvKPPT6O_mzJ7GqUvA-1; Thu, 05 Mar 2026 05:53:21 -0500 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 7A7D11800283; Thu, 5 Mar 2026 10:53:20 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.45.224.75]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 3CF063003E9E; Thu, 5 Mar 2026 10:53:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1772708004; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UF6Dso2itn/3ESk+NM4HgSMdzC4V7xHqiWg2my0AHdc=; b=H0skHejlCm79XzowpS55ymCaIxXTfWn5fbQMEEKl4XjBYjLSsLycvlmkAsERMVOYC84SOf lrsDjWxkH3dqTHUXWjYV1ppzQRwpRnRngvF00TdkrRXd5nFt6buv6Ohda484w+9M8hzbR4 EJt9d3Tg+PW4sgVTm59KKkbsa8jd5Do= X-MC-Unique: CnmvxvKPPT6O_mzJ7GqUvA-1 X-Mimecast-MFC-AGG-ID: CnmvxvKPPT6O_mzJ7GqUvA_1772708000 From: Thomas Huth To: Peter Maydell Cc: qemu-devel@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Xiaoyao Li Subject: [PULL 19/28] hw/i386/pc: Remove deprecated pc-q35-2.11 and pc-i440fx-2.11 machines Date: Thu, 5 Mar 2026 11:52:06 +0100 Message-ID: <20260305105215.302571-20-thuth@redhat.com> In-Reply-To: <20260305105215.302571-1-thuth@redhat.com> References: <20260305105215.302571-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 0 X-Spam_score: -0.0 X-Spam_bar: / X-Spam_report: (-0.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.703, RCVD_IN_VALIDITY_SAFE_BLOCKED=1.386, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1772708066642154100 From: Philippe Mathieu-Daud=C3=A9 These machines has been supported for a period of more than 6 years. According to our versioned machine support policy (see commit ce80c4fa6ff "docs: document special exception for machine type deprecation & removal") they can now be removed. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20250501223522.99772-6-philmd@linaro.org> Reviewed-by: Thomas Huth Reviewed-by: Xiaoyao Li Signed-off-by: Thomas Huth --- hw/i386/pc_piix.c | 9 --------- hw/i386/pc_q35.c | 10 ---------- 2 files changed, 19 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 64927b47d92..8a4b6509444 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -686,15 +686,6 @@ static void pc_i440fx_machine_2_12_options(MachineClas= s *m) =20 DEFINE_I440FX_MACHINE(2, 12); =20 -static void pc_i440fx_machine_2_11_options(MachineClass *m) -{ - pc_i440fx_machine_2_12_options(m); - compat_props_add(m->compat_props, hw_compat_2_11, hw_compat_2_11_len); - compat_props_add(m->compat_props, pc_compat_2_11, pc_compat_2_11_len); -} - -DEFINE_I440FX_MACHINE(2, 11); - #ifdef CONFIG_XEN static void xenfv_machine_4_2_options(MachineClass *m) { diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index ad40e9045b2..60a1b75b450 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -632,13 +632,3 @@ static void pc_q35_machine_2_12_options(MachineClass *= m) } =20 DEFINE_Q35_MACHINE(2, 12); - -static void pc_q35_machine_2_11_options(MachineClass *m) -{ - pc_q35_machine_2_12_options(m); - m->default_nic =3D "e1000"; - compat_props_add(m->compat_props, hw_compat_2_11, hw_compat_2_11_len); - compat_props_add(m->compat_props, pc_compat_2_11, pc_compat_2_11_len); -} - -DEFINE_Q35_MACHINE(2, 11); --=20 2.53.0