[PATCH 0/8] hw/i386/pc: Remove deprecated 2.10, 2.11 and 2.12 PC machines

[PATCH 0/8] hw/i386/pc: Remove deprecated 2.10, 2.11 and 2.12 PC machines

[Philippe Mathieu-Daudé]

The versioned 'pc' and 'q35' machines up to 2.12 been marked
as deprecated two releases ago, and are older than 6 years,
so according to our support policy we can remove them.

This series includes the 2.10 to 2.12 machines removal.

Philippe Mathieu-Daudé (8):
  hw/i386/pc: Remove deprecated pc-q35-2.10 and pc-i440fx-2.10 machines
  hw/i386/pc: Remove pc_compat_2_10[] array
  hw/pci-host/i440fx: Remove I440FXState::pci_hole64_fix field
  hw/pci-host/q35: Remove Q35PCIHost::pci_hole64_fix field
  hw/i386/pc: Remove deprecated pc-q35-2.11 and pc-i440fx-2.11 machines
  hw/i386/pc: Remove pc_compat_2_11[] array
  hw/i386/pc: Remove deprecated pc-q35-2.12 and pc-i440fx-2.12 machines
  hw/i386/pc: Remove pc_compat_2_12[] array

 include/hw/i386/pc.h      |  9 ---------
 include/hw/pci-host/q35.h |  1 -
 hw/i386/pc.c              | 21 ---------------------
 hw/i386/pc_piix.c         | 28 ----------------------------
 hw/i386/pc_q35.c          | 29 -----------------------------
 hw/pci-host/i440fx.c      |  7 ++-----
 hw/pci-host/q35.c         |  6 ++----
 7 files changed, 4 insertions(+), 97 deletions(-)

-- 
2.47.1

[PATCH 1/8] hw/i386/pc: Remove deprecated pc-q35-2.10 and pc-i440fx-2.10 machines

[Philippe Mathieu-Daudé]

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

[PATCH 2/8] hw/i386/pc: Remove pc_compat_2_10[] array

[Philippe Mathieu-Daudé]

The pc_compat_2_10[] array was only used by the pc-q35-2.10
and pc-i440fx-2.10 machines, which got removed. Remove it.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 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 455b869cce9..c27ff262033 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -280,9 +280,6 @@ extern const size_t pc_compat_2_12_len;
 extern GlobalProperty pc_compat_2_11[];
 extern const size_t pc_compat_2_11_len;
 
-extern GlobalProperty pc_compat_2_10[];
-extern const size_t pc_compat_2_10_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 298091932ab..d3e38cf9f92 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -220,13 +220,6 @@ GlobalProperty pc_compat_2_11[] = {
 };
 const size_t pc_compat_2_11_len = G_N_ELEMENTS(pc_compat_2_11);
 
-GlobalProperty pc_compat_2_10[] = {
-    { TYPE_X86_CPU, "x-hv-max-vps", "0x40" },
-    { "i440FX-pcihost", "x-pci-hole64-fix", "off" },
-    { "q35-pcihost", "x-pci-hole64-fix", "off" },
-};
-const size_t pc_compat_2_10_len = G_N_ELEMENTS(pc_compat_2_10);
-
 /*
  * @PC_FW_DATA:
  * Size of the chunk of memory at the top of RAM for the BIOS ACPI tables
-- 
2.47.1

[PATCH 3/8] hw/pci-host/i440fx: Remove I440FXState::pci_hole64_fix field

[Philippe Mathieu-Daudé]

The I440FXState::pci_hole64_fix boolean was only set in the
pc_compat_2_10[] array, via the 'x-pci-hole64-fix=off' property.
We removed all machines using that array, lets remove that
property and all the code around it.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 hw/pci-host/i440fx.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/hw/pci-host/i440fx.c b/hw/pci-host/i440fx.c
index e13bb1b53e4..8071972d04f 100644
--- a/hw/pci-host/i440fx.c
+++ b/hw/pci-host/i440fx.c
@@ -55,7 +55,6 @@ struct I440FXState {
     uint64_t below_4g_mem_size;
     uint64_t above_4g_mem_size;
     uint64_t pci_hole64_size;
-    bool pci_hole64_fix;
 
     char *pci_type;
 };
@@ -173,13 +172,12 @@ static void i440fx_pcihost_get_pci_hole_end(Object *obj, Visitor *v,
 static uint64_t i440fx_pcihost_get_pci_hole64_start_value(Object *obj)
 {
     PCIHostState *h = PCI_HOST_BRIDGE(obj);
-    I440FXState *s = I440FX_PCI_HOST_BRIDGE(obj);
     Range w64;
     uint64_t value;
 
     pci_bus_get_w64_range(h->bus, &w64);
     value = range_is_empty(&w64) ? 0 : range_lob(&w64);
-    if (!value && s->pci_hole64_fix) {
+    if (!value) {
         value = pc_pci_hole64_start();
     }
     return value;
@@ -213,7 +211,7 @@ static void i440fx_pcihost_get_pci_hole64_end(Object *obj, Visitor *v,
     pci_bus_get_w64_range(h->bus, &w64);
     value = range_is_empty(&w64) ? 0 : range_upb(&w64) + 1;
     hole64_end = ROUND_UP(hole64_start + s->pci_hole64_size, 1ULL << 30);
-    if (s->pci_hole64_fix && value < hole64_end) {
+    if (value < hole64_end) {
         value = hole64_end;
     }
     visit_type_uint64(v, name, &value, errp);
@@ -360,7 +358,6 @@ static const Property i440fx_props[] = {
                      below_4g_mem_size, 0),
     DEFINE_PROP_SIZE(PCI_HOST_ABOVE_4G_MEM_SIZE, I440FXState,
                      above_4g_mem_size, 0),
-    DEFINE_PROP_BOOL("x-pci-hole64-fix", I440FXState, pci_hole64_fix, true),
     DEFINE_PROP_STRING(I440FX_HOST_PROP_PCI_TYPE, I440FXState, pci_type),
 };
 
-- 
2.47.1

[PATCH 4/8] hw/pci-host/q35: Remove Q35PCIHost::pci_hole64_fix field

[Philippe Mathieu-Daudé]

The Q35PCIHost::pci_hole64_fix boolean was only set in
the pc_compat_2_10[] array, via the 'x-pci-hole64-fix=off'
property. We removed all machines using that array, lets
remove that property and all the code around it.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 include/hw/pci-host/q35.h | 1 -
 hw/pci-host/q35.c         | 6 ++----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/include/hw/pci-host/q35.h b/include/hw/pci-host/q35.h
index ddafc3f2e3d..75810528205 100644
--- a/include/hw/pci-host/q35.h
+++ b/include/hw/pci-host/q35.h
@@ -63,7 +63,6 @@ struct Q35PCIHost {
     PCIExpressHost parent_obj;
     /*< public >*/
 
-    bool pci_hole64_fix;
     MCHPCIState mch;
 };
 
diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c
index 1951ae440cc..f6e29cc4fc8 100644
--- a/hw/pci-host/q35.c
+++ b/hw/pci-host/q35.c
@@ -116,13 +116,12 @@ static void q35_host_get_pci_hole_end(Object *obj, Visitor *v,
 static uint64_t q35_host_get_pci_hole64_start_value(Object *obj)
 {
     PCIHostState *h = PCI_HOST_BRIDGE(obj);
-    Q35PCIHost *s = Q35_HOST_DEVICE(obj);
     Range w64;
     uint64_t value;
 
     pci_bus_get_w64_range(h->bus, &w64);
     value = range_is_empty(&w64) ? 0 : range_lob(&w64);
-    if (!value && s->pci_hole64_fix) {
+    if (!value) {
         value = pc_pci_hole64_start();
     }
     return value;
@@ -156,7 +155,7 @@ static void q35_host_get_pci_hole64_end(Object *obj, Visitor *v,
     pci_bus_get_w64_range(h->bus, &w64);
     value = range_is_empty(&w64) ? 0 : range_upb(&w64) + 1;
     hole64_end = ROUND_UP(hole64_start + s->mch.pci_hole64_size, 1ULL << 30);
-    if (s->pci_hole64_fix && value < hole64_end) {
+    if (value < hole64_end) {
         value = hole64_end;
     }
     visit_type_uint64(v, name, &value, errp);
@@ -181,7 +180,6 @@ static const Property q35_host_props[] = {
                      mch.above_4g_mem_size, 0),
     DEFINE_PROP_BOOL(PCI_HOST_PROP_SMM_RANGES, Q35PCIHost,
                      mch.has_smm_ranges, true),
-    DEFINE_PROP_BOOL("x-pci-hole64-fix", Q35PCIHost, pci_hole64_fix, true),
 };
 
 static void q35_host_class_init(ObjectClass *klass, const void *data)
-- 
2.47.1

[PATCH 5/8] hw/i386/pc: Remove deprecated pc-q35-2.11 and pc-i440fx-2.11 machines

[Philippe Mathieu-Daudé]

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 |  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 f0f71de4405..4de84bce8ef 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -718,15 +718,6 @@ static void pc_i440fx_machine_2_12_options(MachineClass *m)
 
 DEFINE_I440FX_MACHINE(2, 12);
 
-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_ISAPC
 static void isapc_machine_options(MachineClass *m)
 {
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index 1bbf2385431..4839e8c5731 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -610,13 +610,3 @@ static void pc_q35_machine_2_12_options(MachineClass *m)
 }
 
 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 = "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);
-- 
2.47.1

[PATCH 6/8] hw/i386/pc: Remove pc_compat_2_11[] array

[Philippe Mathieu-Daudé]

The pc_compat_2_11[] array was only used by the pc-q35-2.11
and pc-i440fx-2.11 machines, which got removed. Remove it.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 include/hw/i386/pc.h | 3 ---
 hw/i386/pc.c         | 6 ------
 2 files changed, 9 deletions(-)

diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index c27ff262033..a81b9c4664c 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -277,9 +277,6 @@ extern const size_t pc_compat_3_0_len;
 extern GlobalProperty pc_compat_2_12[];
 extern const size_t pc_compat_2_12_len;
 
-extern GlobalProperty pc_compat_2_11[];
-extern const size_t pc_compat_2_11_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 d3e38cf9f92..2119029f4be 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -214,12 +214,6 @@ GlobalProperty pc_compat_2_12[] = {
 };
 const size_t pc_compat_2_12_len = G_N_ELEMENTS(pc_compat_2_12);
 
-GlobalProperty pc_compat_2_11[] = {
-    { TYPE_X86_CPU, "x-migrate-smi-count", "off" },
-    { "Skylake-Server" "-" TYPE_X86_CPU, "clflushopt", "off" },
-};
-const size_t pc_compat_2_11_len = G_N_ELEMENTS(pc_compat_2_11);
-
 /*
  * @PC_FW_DATA:
  * Size of the chunk of memory at the top of RAM for the BIOS ACPI tables
-- 
2.47.1

[PATCH 7/8] hw/i386/pc: Remove deprecated pc-q35-2.12 and pc-i440fx-2.12 machines

[Philippe Mathieu-Daudé]

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 | 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 4de84bce8ef..a8fda35bb9b 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -709,15 +709,6 @@ static void pc_i440fx_machine_3_0_options(MachineClass *m)
 
 DEFINE_I440FX_MACHINE(3, 0);
 
-static void pc_i440fx_machine_2_12_options(MachineClass *m)
-{
-    pc_i440fx_machine_3_0_options(m);
-    compat_props_add(m->compat_props, hw_compat_2_12, hw_compat_2_12_len);
-    compat_props_add(m->compat_props, pc_compat_2_12, pc_compat_2_12_len);
-}
-
-DEFINE_I440FX_MACHINE(2, 12);
-
 #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 4839e8c5731..0c7b407952c 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -601,12 +601,3 @@ static void pc_q35_machine_3_0_options(MachineClass *m)
 }
 
 DEFINE_Q35_MACHINE(3, 0);
-
-static void pc_q35_machine_2_12_options(MachineClass *m)
-{
-    pc_q35_machine_3_0_options(m);
-    compat_props_add(m->compat_props, hw_compat_2_12, hw_compat_2_12_len);
-    compat_props_add(m->compat_props, pc_compat_2_12, pc_compat_2_12_len);
-}
-
-DEFINE_Q35_MACHINE(2, 12);
-- 
2.47.1

[PATCH 8/8] hw/i386/pc: Remove pc_compat_2_12[] array

[Philippe Mathieu-Daudé]

The pc_compat_2_12[] array was only used by the pc-q35-2.12
and pc-i440fx-2.12 machines, which got removed. Remove it.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 include/hw/i386/pc.h | 3 ---
 hw/i386/pc.c         | 8 --------
 2 files changed, 11 deletions(-)

diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index a81b9c4664c..22a29576f04 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -274,9 +274,6 @@ extern const size_t pc_compat_3_1_len;
 extern GlobalProperty pc_compat_3_0[];
 extern const size_t pc_compat_3_0_len;
 
-extern GlobalProperty pc_compat_2_12[];
-extern const size_t pc_compat_2_12_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 2119029f4be..18a62b26b5d 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -206,14 +206,6 @@ GlobalProperty pc_compat_3_0[] = {
 };
 const size_t pc_compat_3_0_len = G_N_ELEMENTS(pc_compat_3_0);
 
-GlobalProperty pc_compat_2_12[] = {
-    { TYPE_X86_CPU, "legacy-cache", "on" },
-    { TYPE_X86_CPU, "topoext", "off" },
-    { "EPYC-" TYPE_X86_CPU, "xlevel", "0x8000000a" },
-    { "EPYC-IBPB-" TYPE_X86_CPU, "xlevel", "0x8000000a" },
-};
-const size_t pc_compat_2_12_len = G_N_ELEMENTS(pc_compat_2_12);
-
 /*
  * @PC_FW_DATA:
  * Size of the chunk of memory at the top of RAM for the BIOS ACPI tables
-- 
2.47.1

Re: [PATCH 0/8] hw/i386/pc: Remove deprecated 2.10, 2.11 and 2.12 PC machines

[Xiaoyao Li]

On 5/2/2025 6:35 AM, Philippe Mathieu-Daudé wrote:
> The versioned 'pc' and 'q35' machines up to 2.12 been marked
> as deprecated two releases ago, and are older than 6 years,
> so according to our support policy we can remove them.
> 
> This series includes the 2.10 to 2.12 machines removal.

For this series,

Reviewed-by: Xiaoyao Li <xiaoyao.li@intel.com>

Besides, please add more patches to remove hw_compat_2_{10,11,12}

> Philippe Mathieu-Daudé (8):
>    hw/i386/pc: Remove deprecated pc-q35-2.10 and pc-i440fx-2.10 machines
>    hw/i386/pc: Remove pc_compat_2_10[] array
>    hw/pci-host/i440fx: Remove I440FXState::pci_hole64_fix field
>    hw/pci-host/q35: Remove Q35PCIHost::pci_hole64_fix field
>    hw/i386/pc: Remove deprecated pc-q35-2.11 and pc-i440fx-2.11 machines
>    hw/i386/pc: Remove pc_compat_2_11[] array
>    hw/i386/pc: Remove deprecated pc-q35-2.12 and pc-i440fx-2.12 machines
>    hw/i386/pc: Remove pc_compat_2_12[] array
> 
>   include/hw/i386/pc.h      |  9 ---------
>   include/hw/pci-host/q35.h |  1 -
>   hw/i386/pc.c              | 21 ---------------------
>   hw/i386/pc_piix.c         | 28 ----------------------------
>   hw/i386/pc_q35.c          | 29 -----------------------------
>   hw/pci-host/i440fx.c      |  7 ++-----
>   hw/pci-host/q35.c         |  6 ++----
>   7 files changed, 4 insertions(+), 97 deletions(-)
> 

Re: [PATCH 0/8] hw/i386/pc: Remove deprecated 2.10, 2.11 and 2.12 PC machines

[Philippe Mathieu-Daudé]

On 4/6/25 03:30, Xiaoyao Li wrote:
> On 5/2/2025 6:35 AM, Philippe Mathieu-Daudé wrote:
>> The versioned 'pc' and 'q35' machines up to 2.12 been marked
>> as deprecated two releases ago, and are older than 6 years,
>> so according to our support policy we can remove them.
>>
>> This series includes the 2.10 to 2.12 machines removal.
> 
> For this series,
> 
> Reviewed-by: Xiaoyao Li <xiaoyao.li@intel.com>

Thanks!

> Besides, please add more patches to remove hw_compat_2_{10,11,12}

Are you asking for this series which was posted more than one month ago?
https://lore.kernel.org/qemu-devel/20250501230129.2596-1-philmd@linaro.org/

> 
>> Philippe Mathieu-Daudé (8):
>>    hw/i386/pc: Remove deprecated pc-q35-2.10 and pc-i440fx-2.10 machines
>>    hw/i386/pc: Remove pc_compat_2_10[] array
>>    hw/pci-host/i440fx: Remove I440FXState::pci_hole64_fix field
>>    hw/pci-host/q35: Remove Q35PCIHost::pci_hole64_fix field
>>    hw/i386/pc: Remove deprecated pc-q35-2.11 and pc-i440fx-2.11 machines
>>    hw/i386/pc: Remove pc_compat_2_11[] array
>>    hw/i386/pc: Remove deprecated pc-q35-2.12 and pc-i440fx-2.12 machines
>>    hw/i386/pc: Remove pc_compat_2_12[] array

Re: [PATCH 0/8] hw/i386/pc: Remove deprecated 2.10, 2.11 and 2.12 PC machines

[Philippe Mathieu-Daudé]

On 4/6/25 09:07, Philippe Mathieu-Daudé wrote:
> On 4/6/25 03:30, Xiaoyao Li wrote:
>> On 5/2/2025 6:35 AM, Philippe Mathieu-Daudé wrote:
>>> The versioned 'pc' and 'q35' machines up to 2.12 been marked
>>> as deprecated two releases ago, and are older than 6 years,
>>> so according to our support policy we can remove them.
>>>
>>> This series includes the 2.10 to 2.12 machines removal.
>>
>> For this series,
>>
>> Reviewed-by: Xiaoyao Li <xiaoyao.li@intel.com>
> 
> Thanks!
> 
>> Besides, please add more patches to remove hw_compat_2_{10,11,12}
> 
> Are you asking for this series which was posted more than one month ago?
> https://lore.kernel.org/qemu-devel/20250501230129.2596-1-philmd@linaro.org/

Actually looking for it (sorry, this was quite some time now) I realized
I did the work up to removing 4.0:

$ git log x86_deprec
commit acc32b99be93105267805d08b6803ce85d4fb997
Author: Philippe Mathieu-Daudé <philmd@linaro.org>
Date:   Tue Apr 29 17:52:38 2025 +0200

     hw/i386/pc: Remove pc_compat_4_0[] array

     The pc_compat_4_0[] array was only used by the pc-q35-4.0,
     pc-q35-4.0.1 and pc-i440fx-4.0 machines, which got removed.
     Remove it.

     Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>

commit 659443241b5bf8266af8a2a3f2bde249564498af
Author: Philippe Mathieu-Daudé <philmd@linaro.org>
Date:   Tue Apr 29 17:51:09 2025 +0200

     hw/i386/pc: Remove deprecated pc-q35-4.0[.1] and pc-i440fx-4.0 machines

     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>

commit d21784220e5d251bc2cfe588a04e3842cde3d8f9
Author: Philippe Mathieu-Daudé <philmd@linaro.org>
Date:   Tue Apr 29 16:55:39 2025 +0200

     hw/i386/pc: Remove pc_compat_3_1[] array

     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é <philmd@linaro.org>

...

At some point I had too many series waiting for review so I stopped 
posting (otherwise having to constantly rebase / repost drains too
much energy on both author and reviewers). I might post them once
the prerequisites are all merged.

Regards,

Phil.

Re: [PATCH 0/8] hw/i386/pc: Remove deprecated 2.10, 2.11 and 2.12 PC machines

[Xiaoyao Li]

On 6/4/2025 3:14 PM, Philippe Mathieu-Daudé wrote:
> On 4/6/25 09:07, Philippe Mathieu-Daudé wrote:
>> On 4/6/25 03:30, Xiaoyao Li wrote:
>>> On 5/2/2025 6:35 AM, Philippe Mathieu-Daudé wrote:
>>>> The versioned 'pc' and 'q35' machines up to 2.12 been marked
>>>> as deprecated two releases ago, and are older than 6 years,
>>>> so according to our support policy we can remove them.
>>>>
>>>> This series includes the 2.10 to 2.12 machines removal.
>>>
>>> For this series,
>>>
>>> Reviewed-by: Xiaoyao Li <xiaoyao.li@intel.com>
>>
>> Thanks!
>>
>>> Besides, please add more patches to remove hw_compat_2_{10,11,12}
>>
>> Are you asking for this series which was posted more than one month ago?
>> https://lore.kernel.org/qemu-devel/20250501230129.2596-1- 
>> philmd@linaro.org/

Sorry that I didn't notice this series. (It would be helpful if call out 
the removal of hw_compat_2_* will be in a separate series in the cover 
letter.)

> Actually looking for it (sorry, this was quite some time now) I realized
> I did the work up to removing 4.0:
> 
> $ git log x86_deprec
> commit acc32b99be93105267805d08b6803ce85d4fb997
> Author: Philippe Mathieu-Daudé <philmd@linaro.org>
> Date:   Tue Apr 29 17:52:38 2025 +0200
> 
>      hw/i386/pc: Remove pc_compat_4_0[] array
> 
>      The pc_compat_4_0[] array was only used by the pc-q35-4.0,
>      pc-q35-4.0.1 and pc-i440fx-4.0 machines, which got removed.
>      Remove it.
> 
>      Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> 
> commit 659443241b5bf8266af8a2a3f2bde249564498af
> Author: Philippe Mathieu-Daudé <philmd@linaro.org>
> Date:   Tue Apr 29 17:51:09 2025 +0200
> 
>      hw/i386/pc: Remove deprecated pc-q35-4.0[.1] and pc-i440fx-4.0 
> machines
> 
>      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>
> 
> commit d21784220e5d251bc2cfe588a04e3842cde3d8f9
> Author: Philippe Mathieu-Daudé <philmd@linaro.org>
> Date:   Tue Apr 29 16:55:39 2025 +0200
> 
>      hw/i386/pc: Remove pc_compat_3_1[] array
> 
>      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é <philmd@linaro.org>
> 
> ...
> 
> At some point I had too many series waiting for review so I stopped 
> posting (otherwise having to constantly rebase / repost drains too
> much energy on both author and reviewers). I might post them once
> the prerequisites are all merged.

Good news is that the removal of PC machine 2.4 and 2.5 is merged. Hope 
the remaining can be merged soon.

> Regards,
> 
> Phil.
> 

Re: [PATCH 4/8] hw/pci-host/q35: Remove Q35PCIHost::pci_hole64_fix field

[Daniel P. Berrangé]

This patch did not get merged so far, so in case it is resurrected
I wanted to warn that even though we're going to be removing machine
types that use it, we might want to keep the property.

In this issue

  https://gitlab.com/qemu-project/qemu/-/issues/1947#note_2994552211

being able to disable the pci_hole64_fix is indicated as a possible
fix for a Windows XP  BSOD.

Perhaps there is a better way to avoid the root cause of the BSOD,
but if not this knob would be useful to retain.


On Fri, May 02, 2025 at 12:35:18AM +0200, Philippe Mathieu-Daudé wrote:
> The Q35PCIHost::pci_hole64_fix boolean was only set in
> the pc_compat_2_10[] array, via the 'x-pci-hole64-fix=off'
> property. We removed all machines using that array, lets
> remove that property and all the code around it.



> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>  include/hw/pci-host/q35.h | 1 -
>  hw/pci-host/q35.c         | 6 ++----
>  2 files changed, 2 insertions(+), 5 deletions(-)
> 
> diff --git a/include/hw/pci-host/q35.h b/include/hw/pci-host/q35.h
> index ddafc3f2e3d..75810528205 100644
> --- a/include/hw/pci-host/q35.h
> +++ b/include/hw/pci-host/q35.h
> @@ -63,7 +63,6 @@ struct Q35PCIHost {
>      PCIExpressHost parent_obj;
>      /*< public >*/
>  
> -    bool pci_hole64_fix;
>      MCHPCIState mch;
>  };
>  
> diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c
> index 1951ae440cc..f6e29cc4fc8 100644
> --- a/hw/pci-host/q35.c
> +++ b/hw/pci-host/q35.c
> @@ -116,13 +116,12 @@ static void q35_host_get_pci_hole_end(Object *obj, Visitor *v,
>  static uint64_t q35_host_get_pci_hole64_start_value(Object *obj)
>  {
>      PCIHostState *h = PCI_HOST_BRIDGE(obj);
> -    Q35PCIHost *s = Q35_HOST_DEVICE(obj);
>      Range w64;
>      uint64_t value;
>  
>      pci_bus_get_w64_range(h->bus, &w64);
>      value = range_is_empty(&w64) ? 0 : range_lob(&w64);
> -    if (!value && s->pci_hole64_fix) {
> +    if (!value) {
>          value = pc_pci_hole64_start();
>      }
>      return value;
> @@ -156,7 +155,7 @@ static void q35_host_get_pci_hole64_end(Object *obj, Visitor *v,
>      pci_bus_get_w64_range(h->bus, &w64);
>      value = range_is_empty(&w64) ? 0 : range_upb(&w64) + 1;
>      hole64_end = ROUND_UP(hole64_start + s->mch.pci_hole64_size, 1ULL << 30);
> -    if (s->pci_hole64_fix && value < hole64_end) {
> +    if (value < hole64_end) {
>          value = hole64_end;
>      }
>      visit_type_uint64(v, name, &value, errp);
> @@ -181,7 +180,6 @@ static const Property q35_host_props[] = {
>                       mch.above_4g_mem_size, 0),
>      DEFINE_PROP_BOOL(PCI_HOST_PROP_SMM_RANGES, Q35PCIHost,
>                       mch.has_smm_ranges, true),
> -    DEFINE_PROP_BOOL("x-pci-hole64-fix", Q35PCIHost, pci_hole64_fix, true),
>  };
>  
>  static void q35_host_class_init(ObjectClass *klass, const void *data)
> -- 
> 2.47.1
> 
> 

With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

Re: [PATCH 1/8] hw/i386/pc: Remove deprecated pc-q35-2.10 and pc-i440fx-2.10 machines

[Thomas Huth]

On 02/05/2025 00.35, Philippe Mathieu-Daudé wrote:
> 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);

Reviewed-by: Thomas Huth <thuth@redhat.com>

Re: [PATCH 2/8] hw/i386/pc: Remove pc_compat_2_10[] array

[Thomas Huth]

On 02/05/2025 00.35, Philippe Mathieu-Daudé wrote:
> The pc_compat_2_10[] array was only used by the pc-q35-2.10
> and pc-i440fx-2.10 machines, which got removed. Remove it.
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   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 455b869cce9..c27ff262033 100644
> --- a/include/hw/i386/pc.h
> +++ b/include/hw/i386/pc.h
> @@ -280,9 +280,6 @@ extern const size_t pc_compat_2_12_len;
>   extern GlobalProperty pc_compat_2_11[];
>   extern const size_t pc_compat_2_11_len;
>   
> -extern GlobalProperty pc_compat_2_10[];
> -extern const size_t pc_compat_2_10_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 298091932ab..d3e38cf9f92 100644
> --- a/hw/i386/pc.c
> +++ b/hw/i386/pc.c
> @@ -220,13 +220,6 @@ GlobalProperty pc_compat_2_11[] = {
>   };
>   const size_t pc_compat_2_11_len = G_N_ELEMENTS(pc_compat_2_11);
>   
> -GlobalProperty pc_compat_2_10[] = {
> -    { TYPE_X86_CPU, "x-hv-max-vps", "0x40" },
> -    { "i440FX-pcihost", "x-pci-hole64-fix", "off" },
> -    { "q35-pcihost", "x-pci-hole64-fix", "off" },
> -};
> -const size_t pc_compat_2_10_len = G_N_ELEMENTS(pc_compat_2_10);
> -
>   /*
>    * @PC_FW_DATA:
>    * Size of the chunk of memory at the top of RAM for the BIOS ACPI tables

Reviewed-by: Thomas Huth <thuth@redhat.com>

Re: [PATCH 5/8] hw/i386/pc: Remove deprecated pc-q35-2.11 and pc-i440fx-2.11 machines

[Thomas Huth]

On 02/05/2025 00.35, Philippe Mathieu-Daudé wrote:
> 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 |  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 f0f71de4405..4de84bce8ef 100644
> --- a/hw/i386/pc_piix.c
> +++ b/hw/i386/pc_piix.c
> @@ -718,15 +718,6 @@ static void pc_i440fx_machine_2_12_options(MachineClass *m)
>   
>   DEFINE_I440FX_MACHINE(2, 12);
>   
> -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_ISAPC
>   static void isapc_machine_options(MachineClass *m)
>   {
> diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
> index 1bbf2385431..4839e8c5731 100644
> --- a/hw/i386/pc_q35.c
> +++ b/hw/i386/pc_q35.c
> @@ -610,13 +610,3 @@ static void pc_q35_machine_2_12_options(MachineClass *m)
>   }
>   
>   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 = "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);

Reviewed-by: Thomas Huth <thuth@redhat.com>

Re: [PATCH 6/8] hw/i386/pc: Remove pc_compat_2_11[] array

[Thomas Huth]

On 02/05/2025 00.35, Philippe Mathieu-Daudé wrote:
> The pc_compat_2_11[] array was only used by the pc-q35-2.11
> and pc-i440fx-2.11 machines, which got removed. Remove it.
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   include/hw/i386/pc.h | 3 ---
>   hw/i386/pc.c         | 6 ------
>   2 files changed, 9 deletions(-)
> 
> diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
> index c27ff262033..a81b9c4664c 100644
> --- a/include/hw/i386/pc.h
> +++ b/include/hw/i386/pc.h
> @@ -277,9 +277,6 @@ extern const size_t pc_compat_3_0_len;
>   extern GlobalProperty pc_compat_2_12[];
>   extern const size_t pc_compat_2_12_len;
>   
> -extern GlobalProperty pc_compat_2_11[];
> -extern const size_t pc_compat_2_11_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 d3e38cf9f92..2119029f4be 100644
> --- a/hw/i386/pc.c
> +++ b/hw/i386/pc.c
> @@ -214,12 +214,6 @@ GlobalProperty pc_compat_2_12[] = {
>   };
>   const size_t pc_compat_2_12_len = G_N_ELEMENTS(pc_compat_2_12);
>   
> -GlobalProperty pc_compat_2_11[] = {
> -    { TYPE_X86_CPU, "x-migrate-smi-count", "off" },
> -    { "Skylake-Server" "-" TYPE_X86_CPU, "clflushopt", "off" },
> -};
> -const size_t pc_compat_2_11_len = G_N_ELEMENTS(pc_compat_2_11);
> -
>   /*
>    * @PC_FW_DATA:
>    * Size of the chunk of memory at the top of RAM for the BIOS ACPI tables

Reviewed-by: Thomas Huth <thuth@redhat.com>

Re: [PATCH 7/8] hw/i386/pc: Remove deprecated pc-q35-2.12 and pc-i440fx-2.12 machines

[Thomas Huth]

On 02/05/2025 00.35, Philippe Mathieu-Daudé wrote:
> 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 | 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 4de84bce8ef..a8fda35bb9b 100644
> --- a/hw/i386/pc_piix.c
> +++ b/hw/i386/pc_piix.c
> @@ -709,15 +709,6 @@ static void pc_i440fx_machine_3_0_options(MachineClass *m)
>   
>   DEFINE_I440FX_MACHINE(3, 0);
>   
> -static void pc_i440fx_machine_2_12_options(MachineClass *m)
> -{
> -    pc_i440fx_machine_3_0_options(m);
> -    compat_props_add(m->compat_props, hw_compat_2_12, hw_compat_2_12_len);
> -    compat_props_add(m->compat_props, pc_compat_2_12, pc_compat_2_12_len);
> -}
> -
> -DEFINE_I440FX_MACHINE(2, 12);
> -
>   #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 4839e8c5731..0c7b407952c 100644
> --- a/hw/i386/pc_q35.c
> +++ b/hw/i386/pc_q35.c
> @@ -601,12 +601,3 @@ static void pc_q35_machine_3_0_options(MachineClass *m)
>   }
>   
>   DEFINE_Q35_MACHINE(3, 0);
> -
> -static void pc_q35_machine_2_12_options(MachineClass *m)
> -{
> -    pc_q35_machine_3_0_options(m);
> -    compat_props_add(m->compat_props, hw_compat_2_12, hw_compat_2_12_len);
> -    compat_props_add(m->compat_props, pc_compat_2_12, pc_compat_2_12_len);
> -}
> -
> -DEFINE_Q35_MACHINE(2, 12);

Reviewed-by: Thomas Huth <thuth@redhat.com>

Re: [PATCH 8/8] hw/i386/pc: Remove pc_compat_2_12[] array

[Thomas Huth]

On 02/05/2025 00.35, Philippe Mathieu-Daudé wrote:
> The pc_compat_2_12[] array was only used by the pc-q35-2.12
> and pc-i440fx-2.12 machines, which got removed. Remove it.
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   include/hw/i386/pc.h | 3 ---
>   hw/i386/pc.c         | 8 --------
>   2 files changed, 11 deletions(-)
> 
> diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
> index a81b9c4664c..22a29576f04 100644
> --- a/include/hw/i386/pc.h
> +++ b/include/hw/i386/pc.h
> @@ -274,9 +274,6 @@ extern const size_t pc_compat_3_1_len;
>   extern GlobalProperty pc_compat_3_0[];
>   extern const size_t pc_compat_3_0_len;
>   
> -extern GlobalProperty pc_compat_2_12[];
> -extern const size_t pc_compat_2_12_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 2119029f4be..18a62b26b5d 100644
> --- a/hw/i386/pc.c
> +++ b/hw/i386/pc.c
> @@ -206,14 +206,6 @@ GlobalProperty pc_compat_3_0[] = {
>   };
>   const size_t pc_compat_3_0_len = G_N_ELEMENTS(pc_compat_3_0);
>   
> -GlobalProperty pc_compat_2_12[] = {
> -    { TYPE_X86_CPU, "legacy-cache", "on" },
> -    { TYPE_X86_CPU, "topoext", "off" },
> -    { "EPYC-" TYPE_X86_CPU, "xlevel", "0x8000000a" },
> -    { "EPYC-IBPB-" TYPE_X86_CPU, "xlevel", "0x8000000a" },
> -};
> -const size_t pc_compat_2_12_len = G_N_ELEMENTS(pc_compat_2_12);
> -
>   /*
>    * @PC_FW_DATA:
>    * Size of the chunk of memory at the top of RAM for the BIOS ACPI tables

Reviewed-by: Thomas Huth <thuth@redhat.com>