In address-spaces.h it can be read that get_system_memory() and
get_system_io() are temporary interfaces which "should only be used temporarily
until a proper bus interface is available". This statement certainly extends to
the address_space_memory and address_space_io singletons. This series attempts
to stop further proliferation of their use by turning TYPE_SYSTEM_BUS into an
object-oriented, "proper bus interface" inspired by PCIBus.
While at it, also the main_system_bus singleton is turned into an attribute of
MachineState. Together, this resolves five singletons in total, making the
ownership relations much more obvious which helps comprehension.
The series is structured as follows: Patch 1 fixes a memory corruption issue
uncovered by running `make check` on the last but one patch of this series.
Patches 2 and 3 turn the main_system_bus singleton into an attribute of
MachineState which provides an alternative to sysbus_get_default(). Patches 4-7
resolve the address space singletons and deprecate the legacy
get_system_memory() et. al functions. Patch 8 attempts to optimize the new
implementations of these legacy functions.
Testing done:
* make check (passes without any issues)
* make check-avocado (no new issues seem to be introduced compared to master)
Bernhard Beschow (9):
hw/riscv/sifive_e: Fix inheritance of SiFiveEState
exec/hwaddr.h: Add missing include
hw/core/sysbus: Resolve main_system_bus singleton
hw/ppc/spapr: Fix code style problems reported by checkpatch
exec/address-spaces: Wrap address space singletons into functions
target/loongarch/cpu: Remove unneeded include directive
hw/sysbus: Introduce dedicated struct SysBusState for TYPE_SYSTEM_BUS
softmmu/physmem: Let SysBusState absorb memory region and address
space singletons
exec/address-spaces: Inline legacy functions
accel/hvf/hvf-accel-ops.c | 2 +-
accel/kvm/kvm-all.c | 12 +++----
hw/alpha/dp264.c | 4 +--
hw/alpha/typhoon.c | 4 +--
hw/arm/smmu-common.c | 4 +--
hw/arm/smmuv3.c | 14 ++++----
hw/arm/virt.c | 2 +-
hw/char/goldfish_tty.c | 4 +--
hw/core/bus.c | 5 ++-
hw/core/loader.c | 2 +-
hw/core/machine.c | 3 ++
hw/core/sysbus.c | 24 ++++----------
hw/dma/pl330.c | 2 +-
hw/dma/rc4030.c | 2 +-
hw/dma/xlnx-zynq-devcfg.c | 4 +--
hw/dma/xlnx_dpdma.c | 8 ++---
hw/hppa/machine.c | 4 +--
hw/hyperv/hyperv.c | 2 +-
hw/hyperv/vmbus.c | 2 +-
hw/i386/amd_iommu.c | 18 +++++-----
hw/i386/fw_cfg.c | 2 +-
hw/i386/intel_iommu.c | 24 +++++++-------
hw/i386/microvm.c | 4 +--
hw/i386/pc.c | 2 +-
hw/i386/xen/xen-hvm.c | 4 +--
hw/ide/ahci.c | 2 +-
hw/ide/macio.c | 10 +++---
hw/intc/apic.c | 2 +-
hw/intc/openpic_kvm.c | 2 +-
hw/intc/pnv_xive.c | 6 ++--
hw/intc/pnv_xive2.c | 6 ++--
hw/intc/riscv_aplic.c | 2 +-
hw/intc/spapr_xive.c | 2 +-
hw/intc/xive.c | 4 +--
hw/intc/xive2.c | 4 +--
hw/mips/jazz.c | 4 +--
hw/misc/lasi.c | 2 +-
hw/misc/macio/mac_dbdma.c | 8 ++---
hw/net/ftgmac100.c | 16 ++++-----
hw/net/i82596.c | 24 +++++++-------
hw/net/imx_fec.c | 22 ++++++-------
hw/net/lasi_i82596.c | 2 +-
hw/net/npcm7xx_emc.c | 14 ++++----
hw/openrisc/boot.c | 2 +-
hw/pci-host/dino.c | 6 ++--
hw/pci-host/pnv_phb3.c | 6 ++--
hw/pci-host/pnv_phb3_msi.c | 6 ++--
hw/pci-host/pnv_phb4.c | 10 +++---
hw/pci/pci.c | 2 +-
hw/ppc/pnv_psi.c | 2 +-
hw/ppc/spapr.c | 4 +--
hw/ppc/spapr_events.c | 2 +-
hw/ppc/spapr_hcall.c | 4 +--
hw/ppc/spapr_iommu.c | 4 +--
hw/ppc/spapr_ovec.c | 8 ++---
hw/ppc/spapr_rtas.c | 2 +-
hw/remote/iommu.c | 2 +-
hw/remote/message.c | 4 +--
hw/remote/proxy-memory-listener.c | 2 +-
hw/riscv/boot.c | 6 ++--
hw/riscv/sifive_e.c | 2 +-
hw/riscv/sifive_u.c | 2 +-
hw/riscv/virt.c | 2 +-
hw/s390x/css.c | 16 ++++-----
hw/s390x/ipl.h | 2 +-
hw/s390x/s390-pci-bus.c | 4 +--
hw/s390x/s390-pci-inst.c | 10 +++---
hw/s390x/s390-skeys.c | 2 +-
hw/s390x/virtio-ccw.c | 10 +++---
hw/sd/sdhci.c | 2 +-
hw/sh4/r2d.c | 4 +--
hw/sparc/sun4m.c | 2 +-
hw/sparc/sun4m_iommu.c | 4 +--
hw/sparc64/sun4u_iommu.c | 4 +--
hw/timer/hpet.c | 2 +-
hw/usb/hcd-ehci-pci.c | 2 +-
hw/usb/hcd-ehci-sysbus.c | 2 +-
hw/usb/hcd-ohci.c | 2 +-
hw/usb/hcd-xhci-sysbus.c | 2 +-
hw/vfio/ap.c | 2 +-
hw/vfio/ccw.c | 2 +-
hw/vfio/common.c | 8 ++---
hw/vfio/platform.c | 2 +-
hw/virtio/vhost-vdpa.c | 2 +-
hw/virtio/vhost.c | 2 +-
hw/virtio/virtio-bus.c | 4 +--
hw/virtio/virtio-iommu.c | 6 ++--
hw/virtio/virtio-pci.c | 2 +-
hw/xen/xen_pt.c | 4 +--
include/exec/address-spaces.h | 49 +++++++++++++++++++++++-----
include/exec/hwaddr.h | 1 +
include/hw/boards.h | 2 ++
include/hw/elf_ops.h | 4 +--
include/hw/misc/macio/macio.h | 2 +-
include/hw/ppc/spapr.h | 6 ++--
include/hw/ppc/vof.h | 4 +--
include/hw/riscv/sifive_e.h | 3 +-
include/hw/sysbus.h | 14 ++++++--
monitor/misc.c | 4 +--
softmmu/ioport.c | 12 +++----
softmmu/memory_mapping.c | 2 +-
softmmu/physmem.c | 41 ++++++++---------------
target/arm/hvf/hvf.c | 4 +--
target/arm/kvm.c | 4 +--
target/avr/helper.c | 8 ++---
target/i386/hax/hax-all.c | 2 +-
target/i386/hax/hax-mem.c | 2 +-
target/i386/hvf/hvf.c | 2 +-
target/i386/hvf/vmx.h | 2 +-
target/i386/hvf/x86_mmu.c | 6 ++--
target/i386/nvmm/nvmm-all.c | 4 +--
target/i386/sev.c | 4 +--
target/i386/tcg/sysemu/misc_helper.c | 12 +++----
target/i386/whpx/whpx-all.c | 4 +--
target/loongarch/cpu.h | 1 -
target/s390x/diag.c | 2 +-
target/s390x/mmu_helper.c | 2 +-
target/s390x/sigp.c | 2 +-
target/xtensa/dbg_helper.c | 2 +-
tests/qtest/fuzz/generic_fuzz.c | 4 +--
120 files changed, 355 insertions(+), 328 deletions(-)
--
2.37.3
