qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Marcel Apfelbaum" <marcel.apfelbaum@gmail.com>,
	"Michael S. Tsirkin" <mst@redhat.com>,
	"Thomas Huth" <thuth@redhat.com>,
	"Eduardo Habkost" <eduardo@habkost.net>,
	"Richard Henderson" <richard.henderson@linaro.org>,
	"Paolo Bonzini" <pbonzini@redhat.com>,
	"Philippe Mathieu-Daudé" <philmd@linaro.org>
Subject: [PATCH 1/8] hw/i386/pc: Remove deprecated pc-q35-2.10 and pc-i440fx-2.10 machines
Date: Fri,  2 May 2025 00:35:15 +0200	[thread overview]
Message-ID: <20250501223522.99772-2-philmd@linaro.org> (raw)
In-Reply-To: <20250501223522.99772-1-philmd@linaro.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é <philmd@linaro.org>
---
 hw/i386/pc_piix.c | 10 ----------
 hw/i386/pc_q35.c  | 10 ----------
 2 files changed, 20 deletions(-)

diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index 5c7d0c50f8e..f0f71de4405 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -727,16 +727,6 @@ static void pc_i440fx_machine_2_11_options(MachineClass *m)
 
 DEFINE_I440FX_MACHINE(2, 11);
 
-static void pc_i440fx_machine_2_10_options(MachineClass *m)
-{
-    pc_i440fx_machine_2_11_options(m);
-    compat_props_add(m->compat_props, hw_compat_2_10, hw_compat_2_10_len);
-    compat_props_add(m->compat_props, pc_compat_2_10, pc_compat_2_10_len);
-    m->auto_enable_numa_with_memhp = false;
-}
-
-DEFINE_I440FX_MACHINE(2, 10);
-
 #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 d66d64b3b62..1bbf2385431 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -620,13 +620,3 @@ static void pc_q35_machine_2_11_options(MachineClass *m)
 }
 
 DEFINE_Q35_MACHINE(2, 11);
-
-static void pc_q35_machine_2_10_options(MachineClass *m)
-{
-    pc_q35_machine_2_11_options(m);
-    compat_props_add(m->compat_props, hw_compat_2_10, hw_compat_2_10_len);
-    compat_props_add(m->compat_props, pc_compat_2_10, pc_compat_2_10_len);
-    m->auto_enable_numa_with_memhp = false;
-}
-
-DEFINE_Q35_MACHINE(2, 10);
-- 
2.47.1



  reply	other threads:[~2025-05-01 22:36 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-05-01 22:35 [PATCH 0/8] hw/i386/pc: Remove deprecated 2.10, 2.11 and 2.12 PC machines Philippe Mathieu-Daudé
2025-05-01 22:35 ` Philippe Mathieu-Daudé [this message]
2025-05-01 22:35 ` [PATCH 2/8] hw/i386/pc: Remove pc_compat_2_10[] array Philippe Mathieu-Daudé
2025-05-01 22:35 ` [PATCH 3/8] hw/pci-host/i440fx: Remove I440FXState::pci_hole64_fix field Philippe Mathieu-Daudé
2025-05-01 22:35 ` [PATCH 4/8] hw/pci-host/q35: Remove Q35PCIHost::pci_hole64_fix field Philippe Mathieu-Daudé
2025-05-01 22:35 ` [PATCH 5/8] hw/i386/pc: Remove deprecated pc-q35-2.11 and pc-i440fx-2.11 machines Philippe Mathieu-Daudé
2025-05-01 22:35 ` [PATCH 6/8] hw/i386/pc: Remove pc_compat_2_11[] array Philippe Mathieu-Daudé
2025-05-01 22:35 ` [PATCH 7/8] hw/i386/pc: Remove deprecated pc-q35-2.12 and pc-i440fx-2.12 machines Philippe Mathieu-Daudé
2025-05-01 22:35 ` [PATCH 8/8] hw/i386/pc: Remove pc_compat_2_12[] array Philippe Mathieu-Daudé
2025-06-04  1:30 ` [PATCH 0/8] hw/i386/pc: Remove deprecated 2.10, 2.11 and 2.12 PC machines Xiaoyao Li
2025-06-04  7:07   ` Philippe Mathieu-Daudé
2025-06-04  7:14     ` Philippe Mathieu-Daudé
2025-06-05  5:12       ` Xiaoyao Li

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250501223522.99772-2-philmd@linaro.org \
    --to=philmd@linaro.org \
    --cc=eduardo@habkost.net \
    --cc=marcel.apfelbaum@gmail.com \
    --cc=mst@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=richard.henderson@linaro.org \
    --cc=thuth@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).