Skip to content

Q35 and I440FX host bridge QOM cleanup

Bernhard Beschow qemu-devel 3 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v3 Latest17 patches 1 replyIn review
  2. v216 patches 5 repliesSuperseded
  3. v115 patches 26 repliesSuperseded

Changes in v3 from the cover letter

* Establish i440fx' parent-child relation earlier (Phil)
* Rename i440fx_host -> phb earlier to avoid some churn in last patch

Patches in v3 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/17hw/i386/pc_q35: Resolve redundant q35_host variablehw/i386/pc_q35.c+13 -140 replies
2/17hw/pci-host/q35: Fix double, contradicting .endianness assignmenthw/pci-host/q35.c+0 -10 replies
3/17hw/pci-host/q35: Initialize PCMachineState::bus in board codehw/i386/pc_q35.c hw/pci-host/q35.c+3 -20 replies
4/17hw/pci/pci_host: Introduce PCI_HOST_BYPASS_IOMMU macrohw/pci/pci_host.c include/hw/pci/pci_host.h+3 -10 replies
5/17hw/pci-host/q35: Initialize PCI_HOST_BYPASS_IOMMU property from board codehw/i386/pc_q35.c hw/pci-host/q35.c+3 -20 replies
6/17hw/pci-host/q35: Make some property name macros reusable by i440fxhw/i386/pc_q35.c hw/pci-host/q35.c include/hw/i386/pc.h +1 more+12 -130 replies
7/17hw/i386/pc_piix: Turn some local variables into initializershw/i386/pc_piix.c+4 -90 replies
8/17hw/pci-host/i440fx: Add "i440fx" child property in board codehw/i386/pc_piix.c hw/pci-host/i440fx.c+2 -10 replies
9/17hw/pci-host/i440fx: Replace magic values by existing constantshw/pci-host/i440fx.c+4 -40 replies
10/17hw/pci-host/i440fx: Have common names for some local variableshw/pci-host/i440fx.c+12 -140 replies
11/17hw/pci-host/i440fx: Move i440fx_realize() into PCII440FXState sectionhw/pci-host/i440fx.c+9 -90 replies
12/17hw/pci-host/i440fx: Make MemoryRegion pointers accessible as propertieshw/pci-host/i440fx.c include/hw/pci-host/i440fx.h+30 -150 replies
13/17hw/pci-host/i440fx: Add PCI_HOST_PROP_IO_MEM propertyhw/pci-host/i440fx.c+10 -40 replies
14/17hw/pci-host/i440fx: Add PCI_HOST_{ABOVE, BELOW}_4G_MEM_SIZE propertieshw/i386/pc_piix.c hw/pci-host/i440fx.c include/hw/pci-host/i440fx.h+14 -40 replies
15/17hw/pci-host/i440fx: Add I440FX_HOST_PROP_PCI_TYPE propertyhw/pci-host/i440fx.c include/hw/pci-host/i440fx.h+7 -10 replies
16/17hw/pci-host/i440fx: Resolve i440fx_init()hw/i386/pc_piix.c hw/pci-host/i440fx.c include/hw/pci-host/i440fx.h+26 -491 reply
17/17hw/i386/pc_piix: Move i440fx' realize near its qdev_new()hw/i386/pc_piix.c+26 -250 replies

Reviews trailers per patch

12 of 17 patches have a Reviewed-by or Acked-by.

PatchPhilippe Mathieu-DaudéIgor MammedovThomas Huth
1/17R-b R-b
2/17R-b
3/17R-b R-b
4/17R-b
5/17R-b R-b
6/17
7/17R-b
8/17
9/17R-b R-b
10/17R-b
11/17R-b
12/17R-b
13/17
14/17
15/17
16/17R-b
17/17R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 3 reviewers.

Read the v3 thread

Cover letter [PATCH v3 00/17] Q35 and I440FX host bridge QOM cleanup

This series resolves the legacy i440fx_init() function and instantiates the I440FX host bridge the QOM way. As a preparation the Q35 host bridge receives some cleanup as well.

Most of the Q35 patches have been submitted under [1] before. This series incorporates only the changes making the two device models consistent with each other.

The original plan of [1] was to clean up Q35 first and then submit a separate follow-up I440FX QOM'ification series. This series takes a more direct approach by cutting down on the changes in both device models while still allowing both device models to be instantiated the same way. The remaining patches in [1] would still be doable.

The series is structured as follows: The first 5 patches clean up Q35, the next patch massages Q35 to share its property names with I440FX. The rest of the series resolves i440fx_init().

Tesging done:
* make check
* make check-avocado
* Run xl create under Xen with the following config:

    name = "Manjaro"
    type = 'hvm'
    memory = 1536
    apic = 1
    usb = 1
    disk = [ "file:manjaro-kde-21.2.6-220416-linux515.iso,hdc:cdrom,r" ]
    device_model_override = "/usr/bin/qemu-system-x86_64"
    vga = "stdvga"
    sdl = 1

v3:
* Establish i440fx' parent-child relation earlier (Phil)
* Rename i440fx_host -> phb earlier to avoid some churn in last patch

v2:
* Rename address_space_io to io_memory (Phil)
* Eliminate one else branch in pc_piix (Igor)
* Make Q35's blackhole_ops DEVICE_LITTLE_ENDIAN again (Igor)
* Possibly ongoing discussion regarding bringing together i440fx new and realize

[1] https://patchew.org/QEMU/[email protected]/

Bernhard Beschow (17):
hw/i386/pc_q35: Resolve redundant q35_host variable hw/pci-host/q35: Fix double, contradicting .endianness assignment hw/pci-host/q35: Initialize PCMachineState::bus in board code hw/pci/pci_host: Introduce PCI_HOST_BYPASS_IOMMU macro hw/pci-host/q35: Initialize PCI_HOST_BYPASS_IOMMU property from board
code
hw/pci-host/q35: Make some property name macros reusable by i440fx hw/i386/pc_piix: Turn some local variables into initializers hw/pci-host/i440fx: Add "i440fx" child property in board code hw/pci-host/i440fx: Replace magic values by existing constants hw/pci-host/i440fx: Have common names for some local variables hw/pci-host/i440fx: Move i440fx_realize() into PCII440FXState section hw/pci-host/i440fx: Make MemoryRegion pointers accessible as
properties
hw/pci-host/i440fx: Add PCI_HOST_PROP_IO_MEM property hw/pci-host/i440fx: Add PCI_HOST_{ABOVE, BELOW}_4G_MEM_SIZE properties hw/pci-host/i440fx: Add I440FX_HOST_PROP_PCI_TYPE property hw/pci-host/i440fx: Resolve i440fx_init()
hw/i386/pc_piix: Move i440fx' realize near its qdev_new()

 include/hw/i386/pc.h         |   4 ++
 include/hw/pci-host/i440fx.h |  16 +----
 include/hw/pci-host/q35.h    |   5 --
 include/hw/pci/pci_host.h    |   2 +
 hw/i386/pc_piix.c            |  59 +++++++++-------
 hw/i386/pc_q35.c             |  31 +++++----
 hw/pci-host/i440fx.c         | 128 +++++++++++++++++++----------------
 hw/pci-host/q35.c            |  13 ++--
 hw/pci/pci_host.c            |   2 +-
 9 files changed, 135 insertions(+), 125 deletions(-)
Signature · 1 line
2.41.0