[v2] hw/i386/pc: Remove deprecated 3.1 machines

[PATCH v2 00/10] hw/i386/pc: Remove deprecated 3.1 machines

Philippe Mathieu-Daudé posted 10 patches 1 month ago

Diff against v1
Download series mbox

Failed in applying to current master (apply log)

Maintainers: "Philippe Mathieu-Daudé" <philmd@linaro.org>, Aurelien Jarno <aurelien@aurel32.net>, "Michael S. Tsirkin" <mst@redhat.com>, Igor Mammedov <imammedo@redhat.com>, Ani Sinha <anisinha@redhat.com>, Marcel Apfelbaum <marcel.apfelbaum@gmail.com>, Eduardo Habkost <eduardo@habkost.net>, Yanan Wang <wangyanan55@huawei.com>, Zhao Liu <zhao1.liu@intel.com>, Paolo Bonzini <pbonzini@redhat.com>, Corey Minyard <cminyard@mvista.com>, Richard Henderson <richard.henderson@linaro.org>, Jason Wang <jasowang@redhat.com>, Yi Liu <yi.l.liu@intel.com>, "Clément Mathieu--Drif" <clement.mathieu--drif@bull.com>, Sergio Lopez <slp@redhat.com>, Alexander Graf <graf@amazon.com>, Dorjoy Chowdhury <dorjoychy111@gmail.com>, Stefan Berger <stefanb@linux.vnet.ibm.com>

hw/tpm/tpm_tis.h               |  1 -
include/hw/core/boards.h       |  4 ----
include/hw/i2c/pm_smbus.h      |  7 -------
include/hw/i386/intel_iommu.h  |  1 -
include/hw/i386/microvm.h      |  2 +-
include/hw/i386/pc.h           |  6 ------
include/hw/i386/x86.h          |  3 +--
include/hw/pci/pcie_port.h     |  3 ---
target/i386/cpu.h              |  3 ---
hw/acpi/piix4.c                |  8 +-------
hw/acpi/tpm.c                  |  4 ----
hw/core/machine.c              | 17 -----------------
hw/i2c/pm_smbus.c              |  7 -------
hw/i2c/smbus_eeprom.c          |  4 +---
hw/i2c/smbus_ich9.c            | 10 ++--------
hw/i386/acpi-build.c           |  2 +-
hw/i386/intel_iommu.c          | 11 +----------
hw/i386/microvm.c              |  2 +-
hw/i386/nitro_enclave.c        |  2 +-
hw/i386/pc.c                   | 31 ++-----------------------------
hw/i386/pc_piix.c              | 25 -------------------------
hw/i386/pc_q35.c               | 14 --------------
hw/i386/x86-common.c           |  6 ++----
hw/pci-bridge/pcie_root_port.c |  3 +--
hw/tpm/tpm_crb.c               | 12 +++---------
hw/tpm/tpm_tis_common.c        |  4 +---
hw/tpm/tpm_tis_isa.c           |  7 ++-----
target/i386/cpu.c              | 10 +---------
28 files changed, 22 insertions(+), 187 deletions(-)

Expand all Fold all

[PATCH v2 00/10] hw/i386/pc: Remove deprecated 3.1 machines

Posted by Philippe Mathieu-Daudé 1 month ago

1 y.o. dust Thomas asked me to rebase & post:

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

v2: Remove xenfv-3.1 in patch #1

Philippe Mathieu-Daudé (10):
  hw/i386/pc: Remove deprecated pc-q35/pc-i440fx/xenfv 3.1 machines
  hw/i386/pc: Remove PCMachineClass::pvh_enabled field
  hw/i386/x86: Remove @pvh_enabled argument in x86_load_linux()
  hw/core/boards: Remove MachineClass::smbus_no_migration_support field
  hw/i386/pc: Remove pc_compat_3_1[] array
  hw/i386/iommu: Remove IntelIOMMUState::dma_drain field
  target/i386/cpu: Remove X86CPU::intel_pt_auto_level field
  hw/core/machine: Remove the hw_compat_3_1[] array
  hw/pci-bridge/pcie_rp: Remove PCIESlot::disable_acs field
  hw/tpm: Remove CRBState::ppi_enabled field

 hw/tpm/tpm_tis.h               |  1 -
 include/hw/core/boards.h       |  4 ----
 include/hw/i2c/pm_smbus.h      |  7 -------
 include/hw/i386/intel_iommu.h  |  1 -
 include/hw/i386/microvm.h      |  2 +-
 include/hw/i386/pc.h           |  6 ------
 include/hw/i386/x86.h          |  3 +--
 include/hw/pci/pcie_port.h     |  3 ---
 target/i386/cpu.h              |  3 ---
 hw/acpi/piix4.c                |  8 +-------
 hw/acpi/tpm.c                  |  4 ----
 hw/core/machine.c              | 17 -----------------
 hw/i2c/pm_smbus.c              |  7 -------
 hw/i2c/smbus_eeprom.c          |  4 +---
 hw/i2c/smbus_ich9.c            | 10 ++--------
 hw/i386/acpi-build.c           |  2 +-
 hw/i386/intel_iommu.c          | 11 +----------
 hw/i386/microvm.c              |  2 +-
 hw/i386/nitro_enclave.c        |  2 +-
 hw/i386/pc.c                   | 31 ++-----------------------------
 hw/i386/pc_piix.c              | 25 -------------------------
 hw/i386/pc_q35.c               | 14 --------------
 hw/i386/x86-common.c           |  6 ++----
 hw/pci-bridge/pcie_root_port.c |  3 +--
 hw/tpm/tpm_crb.c               | 12 +++---------
 hw/tpm/tpm_tis_common.c        |  4 +---
 hw/tpm/tpm_tis_isa.c           |  7 ++-----
 target/i386/cpu.c              | 10 +---------
 28 files changed, 22 insertions(+), 187 deletions(-)

-- 
2.53.0

Re: [PATCH v2 00/10] hw/i386/pc: Remove deprecated 3.1 machines

Posted by Zhao Liu 1 month ago

On Mon, Mar 09, 2026 at 03:50:02PM +0100, Philippe Mathieu-Daudé wrote:
> Date: Mon,  9 Mar 2026 15:50:02 +0100
> From: Philippe Mathieu-Daudé <philmd@linaro.org>
> Subject: [PATCH v2 00/10] hw/i386/pc: Remove deprecated 3.1 machines
> X-Mailer: git-send-email 2.53.0
> 
> 1 y.o. dust Thomas asked me to rebase & post:
> 
> The versioned 'pc' and 'q35' machines up to 3.1 been marked
> as deprecated two releases ago, and are older than 6 years,
> so according to our support policy we can remove them.
> 
> v2: Remove xenfv-3.1 in patch #1
> 
> Philippe Mathieu-Daudé (10):
>   hw/i386/pc: Remove deprecated pc-q35/pc-i440fx/xenfv 3.1 machines
>   hw/i386/pc: Remove PCMachineClass::pvh_enabled field
>   hw/i386/x86: Remove @pvh_enabled argument in x86_load_linux()
>   hw/core/boards: Remove MachineClass::smbus_no_migration_support field
>   hw/i386/pc: Remove pc_compat_3_1[] array
>   hw/i386/iommu: Remove IntelIOMMUState::dma_drain field
>   target/i386/cpu: Remove X86CPU::intel_pt_auto_level field
>   hw/core/machine: Remove the hw_compat_3_1[] array
>   hw/pci-bridge/pcie_rp: Remove PCIESlot::disable_acs field
>   hw/tpm: Remove CRBState::ppi_enabled field

Just a rough idea - not sure whether patches 9 and 10 should be
deprecated before removal. Maybe someone might still use them for
emulating older systems?

If you feel it needs to be deprecated first, I could add these two
properties to my series about deprecated property support (v3) -
v3 will take some time.

Thanks,
Zhao

Re: [PATCH v2 00/10] hw/i386/pc: Remove deprecated 3.1 machines

Posted by Philippe Mathieu-Daudé 1 month ago

On 9/3/26 15:50, Philippe Mathieu-Daudé wrote:

> Philippe Mathieu-Daudé (10):
>    hw/i386/pc: Remove deprecated pc-q35/pc-i440fx/xenfv 3.1 machines
>    hw/i386/pc: Remove PCMachineClass::pvh_enabled field
>    hw/i386/x86: Remove @pvh_enabled argument in x86_load_linux()
>    hw/core/boards: Remove MachineClass::smbus_no_migration_support field
>    hw/i386/pc: Remove pc_compat_3_1[] array
>    hw/i386/iommu: Remove IntelIOMMUState::dma_drain field
>    target/i386/cpu: Remove X86CPU::intel_pt_auto_level field
>    hw/core/machine: Remove the hw_compat_3_1[] array
>    hw/pci-bridge/pcie_rp: Remove PCIESlot::disable_acs field

Series queued via hw-misc, thanks.