Skip to content

hw/i386/pc: Remove deprecated 2.4 and 2.5 PC machines

Philippe Mathieu-Daudé qemu-devel 2 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest19 patches 6 repliesIn review
  2. v121 patches 43 repliesSuperseded

Changes in v2 from the cover letter

- Fixed issues noticed by Thomas

Patches in v2 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/19hw/i386/pc: Remove deprecated pc-q35-2.4 and pc-i440fx-2.4 machineshw/i386/pc_piix.c hw/i386/pc_q35.c+0 -261 reply
2/19hw/i386/pc: Remove PCMachineClass::broken_reserved_end fieldhw/i386/pc.c include/hw/i386/pc.h+5 -90 replies
3/19hw/i386/pc: Remove pc_compat_2_4[] arrayhw/i386/pc.c include/hw/i386/pc.h+0 -220 replies
4/19target/i386/cpu: Remove X86CPU::check_cpuid fieldtarget/i386/cpu.c target/i386/cpu.h+1 -30 replies
5/19hw/core/machine: Remove hw_compat_2_4[] arrayhw/core/machine.c include/hw/boards.h+0 -120 replies
6/19hw/net/e1000: Remove unused E1000_FLAG_MAC flaghw/net/e1000.c+14 -580 replies
7/19hw/virtio/virtio-pci: Remove VIRTIO_PCI_FLAG_MIGRATE_EXTRA definitionhw/virtio/virtio-pci.c include/hw/virtio/virtio-pci.h+1 -91 reply
8/19hw/virtio/virtio-pci: Remove VIRTIO_PCI_FLAG_DISABLE_PCIE definitionhw/virtio/virtio-pci.c include/hw/virtio/virtio-pci.h+1 -80 replies
9/19hw/i386/pc: Remove deprecated pc-q35-2.5 and pc-i440fx-2.5 machineshw/i386/pc.c hw/i386/pc_piix.c hw/i386/pc_q35.c +1 more+0 -320 replies
10/19hw/i386/x86: Remove X86MachineClass::save_tsc_khz fieldhw/i386/x86.c include/hw/i386/x86.h target/i386/machine.c+2 -90 replies
11/19hw/nvram/fw_cfg: Remove legacy FW_CFG_ORDER_OVERRIDEhw/core/loader.c hw/i386/pc.c hw/nvram/fw_cfg.c +4 more+9 -1410 replies
12/19hw/core/machine: Remove hw_compat_2_5[] arrayhw/core/machine.c include/hw/boards.h+0 -120 replies
13/19hw/block/fdc-isa: Remove 'fallback' propertyhw/block/fdc-isa.c+1 -30 replies
14/19hw/scsi/vmw_pvscsi: Remove PVSCSI_COMPAT_OLD_PCI_CONFIGURATION definitionhw/scsi/vmw_pvscsi.c+7 -191 reply
15/19hw/scsi/vmw_pvscsi: Remove PVSCSI_COMPAT_DISABLE_PCIE_BIT definitionhw/scsi/vmw_pvscsi.c+1 -291 reply
16/19hw/scsi/vmw_pvscsi: Convert DeviceRealize -> InstanceInithw/scsi/vmw_pvscsi.c+3 -100 replies
17/19hw/net/vmxnet3: Remove VMXNET3_COMPAT_FLAG_OLD_MSI_OFFSETS definitionhw/net/vmxnet3.c+6 -140 replies
18/19hw/net/vmxnet3: Remove VMXNET3_COMPAT_FLAG_DISABLE_PCIE definitionhw/net/vmxnet3.c+1 -100 replies
19/19hw/net/vmxnet3: Merge DeviceRealize in InstanceInithw/net/vmxnet3.c+1 -140 replies

Reviews trailers per patch

All 19 patches have a Reviewed-by or Acked-by.

PatchDaniel P. BerrangéThomas Huth
1/19R-b R-b
2/19R-b R-b
3/19R-b
4/19R-b
5/19R-b
6/19R-b
7/19R-b R-b
8/19R-b R-b
9/19R-b
10/19R-b R-b
11/19R-b
12/19R-b
13/19R-b
14/19R-b R-b
15/19R-b R-b
16/19R-b
17/19R-b
18/19R-b
19/19R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v2 thread

Cover letter [PATCH v2 00/19] hw/i386/pc: Remove deprecated 2.4 and 2.5 PC machines

Since v1:
- Fixed issues noticed by Thomas

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 only includes the 2.4 and 2.5 machines removal, as it is a big enough number of LoC removed. Rest will follow. Highlight is the legacy fw_cfg API removal :)

Philippe Mathieu-Daudé (19):
hw/i386/pc: Remove deprecated pc-q35-2.4 and pc-i440fx-2.4 machines hw/i386/pc: Remove PCMachineClass::broken_reserved_end field hw/i386/pc: Remove pc_compat_2_4[] array
target/i386/cpu: Remove X86CPU::check_cpuid field hw/core/machine: Remove hw_compat_2_4[] array hw/net/e1000: Remove unused E1000_FLAG_MAC flag hw/virtio/virtio-pci: Remove VIRTIO_PCI_FLAG_MIGRATE_EXTRA definition hw/virtio/virtio-pci: Remove VIRTIO_PCI_FLAG_DISABLE_PCIE definition hw/i386/pc: Remove deprecated pc-q35-2.5 and pc-i440fx-2.5 machines hw/i386/x86: Remove X86MachineClass::save_tsc_khz field hw/nvram/fw_cfg: Remove legacy FW_CFG_ORDER_OVERRIDE hw/core/machine: Remove hw_compat_2_5[] array hw/block/fdc-isa: Remove 'fallback' property hw/scsi/vmw_pvscsi: Remove PVSCSI_COMPAT_OLD_PCI_CONFIGURATION
definition
hw/scsi/vmw_pvscsi: Remove PVSCSI_COMPAT_DISABLE_PCIE_BIT definition hw/scsi/vmw_pvscsi: Convert DeviceRealize -> InstanceInit hw/net/vmxnet3: Remove VMXNET3_COMPAT_FLAG_OLD_MSI_OFFSETS definition hw/net/vmxnet3: Remove VMXNET3_COMPAT_FLAG_DISABLE_PCIE definition hw/net/vmxnet3: Merge DeviceRealize in InstanceInit

 include/hw/boards.h            |   9 +--
 include/hw/i386/pc.h           |   7 ---
 include/hw/i386/x86.h          |   5 --
 include/hw/loader.h            |   2 -
 include/hw/nvram/fw_cfg.h      |  10 ---
 include/hw/virtio/virtio-pci.h |   8 ---
 target/i386/cpu.h              |   1 -
 hw/block/fdc-isa.c             |   4 +-
 hw/core/loader.c               |  14 -----
 hw/core/machine.c              |  18 ------
 hw/i386/pc.c                   |  42 ++-----------
 hw/i386/pc_piix.c              |  26 --------
 hw/i386/pc_q35.c               |  26 --------
 hw/i386/x86.c                  |   1 -
 hw/net/e1000.c                 |  72 +++++-----------------
 hw/net/vmxnet3.c               |  44 +++----------
 hw/nvram/fw_cfg.c              | 109 +++------------------------------
 hw/scsi/vmw_pvscsi.c           |  67 +++-----------------
 hw/virtio/virtio-pci.c         |  11 +---
 system/vl.c                    |   5 --
 target/i386/cpu.c              |   3 +-
 target/i386/machine.c          |   5 +-
 22 files changed, 51 insertions(+), 438 deletions(-)
Signature · 1 line
2.47.1