On 3/17/26 12:42 PM, Pierrick Bouvier wrote:
This series makes changes to hw/vfio to compile files only once.
Changes are pretty straightforward and are mostly extraction of kvm/other config
specific functions to proper files.
This is the last hw/* subsystem that needs to be changed for single-binary.
v4
--
- rewrite commit description for "hw/vfio: eradicate CONFIG_IOMMU from sources"
v2 (sent as v3)
---------------
- use global stub_ss (fix some missing dependencies in this case)
- move kvm_enabled() guard check on function calls
- s/Vfio spapr kvm/VFIO sPAPR KVM/
Pierrick Bouvier (8):
hw/vfio/listener.c: remove CONFIG_KVM
hw/vfio/helpers.c: extract kvm helpers in kvm-helpers.c
hw/vfio/pci-quirks.c: remove CONFIG_VFIO_IGD
hw/vfio: eradicate CONFIG_IOMMU from sources
hw/vfio/pci.c: eradicate CONFIG_KVM
hw/vfio/ap.c: use full path for target specific header
hw/vfio/spapr.c: extract vfio_spapr_kvm_attach_tce to
hw/vfio/kvm-spapr.c
hw/vfio: all vfio files can now be common files
meson.build | 2 +-
hw/vfio/kvm-spapr.h | 12 +++
hw/vfio/pci.h | 2 +
target/s390x/kvm/kvm_s390x.h | 2 +-
hw/vfio/ap.c | 11 +-
hw/vfio/ccw.c | 9 --
hw/vfio/helpers.c | 172 -------------------------------
hw/vfio/igd-stubs.c | 20 ++++
hw/vfio/kvm-helpers.c | 192 +++++++++++++++++++++++++++++++++++
hw/vfio/kvm-spapr.c | 47 +++++++++
hw/vfio/kvm-stubs.c | 34 +++++++
hw/vfio/listener.c | 4 -
hw/vfio/pci-quirks.c | 5 -
hw/vfio/pci.c | 39 ++-----
hw/vfio/spapr.c | 30 +-----
hw/vfio/meson.build | 6 +-
16 files changed, 329 insertions(+), 258 deletions(-)
create mode 100644 hw/vfio/kvm-spapr.h
create mode 100644 hw/vfio/igd-stubs.c
create mode 100644 hw/vfio/kvm-helpers.c
create mode 100644 hw/vfio/kvm-spapr.c
create mode 100644 hw/vfio/kvm-stubs.c
Sent v5, with commit description fix and rebase on top of master:
https://lore.kernel.org/qemu-devel/[email protected]/T/#t
@Cédric, this should give you a clean series to apply when the tree will
reopen.
Thanks,
Pierrick
