Move stubs to the global stub_ss[] source set. These files are now built once for all binaries, instead of one time per system binary.
Signed-off-by: Philippe Mathieu-Daudé <[email protected]> Reviewed-by: Pierrick Bouvier <[email protected]> --- hw/cxl/meson.build | 4 ++-- hw/i386/kvm/meson.build | 5 +---- hw/mem/meson.build | 4 ++-- hw/pci/meson.build | 2 +- hw/smbios/meson.build | 10 +++++----- hw/usb/meson.build | 3 ++- hw/virtio/meson.build | 9 +++------ 7 files changed, 16 insertions(+), 21 deletions(-) diff --git a/hw/cxl/meson.build b/hw/cxl/meson.build index 3e375f61a98..5f61273a68d 100644 --- a/hw/cxl/meson.build +++ b/hw/cxl/meson.build @@ -7,7 +7,7 @@ system_ss.add(when: 'CONFIG_CXL', 'cxl-cdat.c', 'cxl-events.c', 'switch-mailbox-cci.c', - ), - if_false: files( + )) +stub_ss.add(files( 'cxl-host-stubs.c', )) diff --git a/hw/i386/kvm/meson.build b/hw/i386/kvm/meson.build index a4a2e23c06e..a34b3504cba 100644 --- a/hw/i386/kvm/meson.build +++ b/hw/i386/kvm/meson.build @@ -15,9 +15,6 @@ i386_kvm_ss.add(when: 'CONFIG_XEN_EMU', if_true: files( i386_ss.add_all(when: 'CONFIG_KVM', if_true: i386_kvm_ss) -xen_stubs_ss = ss.source_set() -xen_stubs_ss.add(when: 'CONFIG_XEN_EMU', if_false: files( +stub_ss.add(files( 'xen-stubs.c', )) - -specific_ss.add_all(when: 'CONFIG_SYSTEM_ONLY', if_true: xen_stubs_ss) diff --git a/hw/mem/meson.build b/hw/mem/meson.build index 1c1c6da24b5..8c2beeb7d4d 100644 --- a/hw/mem/meson.build +++ b/hw/mem/meson.build @@ -4,9 +4,9 @@ mem_ss.add(when: 'CONFIG_DIMM', if_true: files('pc-dimm.c')) mem_ss.add(when: 'CONFIG_NPCM7XX', if_true: files('npcm7xx_mc.c')) mem_ss.add(when: 'CONFIG_NVDIMM', if_true: files('nvdimm.c')) mem_ss.add(when: 'CONFIG_CXL_MEM_DEVICE', if_true: files('cxl_type3.c')) -system_ss.add(when: 'CONFIG_CXL_MEM_DEVICE', if_false: files('cxl_type3_stubs.c')) +stub_ss.add(files('cxl_type3_stubs.c')) -system_ss.add(when: 'CONFIG_MEM_DEVICE', if_false: files('memory-device-stubs.c')) +stub_ss.add(files('memory-device-stubs.c')) system_ss.add_all(when: 'CONFIG_MEM_DEVICE', if_true: mem_ss) system_ss.add(when: 'CONFIG_SPARSE_MEM', if_true: files('sparse-mem.c')) diff --git a/hw/pci/meson.build b/hw/pci/meson.build index b9c34b2acfe..a6cbd89c0a3 100644 --- a/hw/pci/meson.build +++ b/hw/pci/meson.build @@ -19,4 +19,4 @@ pci_ss.add(files('pcie_doe.c')) system_ss.add(when: 'CONFIG_PCI_EXPRESS', if_true: files('pcie_port.c', 'pcie_host.c')) system_ss.add_all(when: 'CONFIG_PCI', if_true: pci_ss) -system_ss.add(when: 'CONFIG_PCI', if_false: files('pci-stub.c')) +stub_ss.add(files('pci-stub.c')) diff --git a/hw/smbios/meson.build b/hw/smbios/meson.build index a59039f6692..9bf4b1ad1e5 100644 --- a/hw/smbios/meson.build +++ b/hw/smbios/meson.build @@ -1,12 +1,12 @@ smbios_ss = ss.source_set() smbios_ss.add(files('smbios.c')) smbios_ss.add(when: 'CONFIG_IPMI', - if_true: files('smbios_type_38.c'), - if_false: files('smbios_type_38-stub.c')) + if_true: files('smbios_type_38.c')) +stub_ss.add(files('smbios_type_38-stub.c')) smbios_ss.add(when: 'CONFIG_SMBIOS_LEGACY', - if_true: files('smbios_legacy.c'), - if_false: files('smbios_legacy_stub.c')) + if_true: files('smbios_legacy.c')) +stub_ss.add(files('smbios_legacy_stub.c')) system_ss.add_all(when: 'CONFIG_SMBIOS', if_true: smbios_ss) -system_ss.add(when: 'CONFIG_SMBIOS', if_false: files('smbios-stub.c')) +stub_ss.add(files('smbios-stub.c')) diff --git a/hw/usb/meson.build b/hw/usb/meson.build index 17360a5b5a4..ba55c28ef69 100644 --- a/hw/usb/meson.build +++ b/hw/usb/meson.build @@ -9,7 +9,8 @@ system_ss.add(when: 'CONFIG_USB', if_true: files( 'desc-msos.c', 'libhw.c', 'pcap.c', -), if_false: files('bus-stub.c')) +)) +stub_ss.add(files('bus-stub.c')) # usb host adapters system_ss.add(when: 'CONFIG_USB_UHCI', if_true: files('hcd-uhci.c')) diff --git a/hw/virtio/meson.build b/hw/virtio/meson.build index 6675b63ce65..3af34ef9321 100644 --- a/hw/virtio/meson.build +++ b/hw/virtio/meson.build @@ -50,8 +50,6 @@ if have_vhost system_virtio_ss.add(files('vhost-vdpa.c')) system_virtio_ss.add(files('vhost-shadow-virtqueue.c')) endif -else - system_virtio_ss.add(files('vhost-stub.c')) endif system_virtio_ss.add(when: 'CONFIG_VHOST_USER_VSOCK', if_true: files('vhost-user-vsock.c')) system_virtio_ss.add(when: 'CONFIG_VIRTIO_RNG', if_true: files('virtio-rng.c')) @@ -94,10 +92,9 @@ virtio_pci_ss.add(when: 'CONFIG_VIRTIO_MD', if_true: files('virtio-md-pci.c')) system_virtio_ss.add_all(when: 'CONFIG_VIRTIO_PCI', if_true: virtio_pci_ss) system_ss.add_all(when: 'CONFIG_VIRTIO', if_true: system_virtio_ss) -system_ss.add(when: 'CONFIG_VIRTIO', if_false: files('vhost-stub.c')) -system_ss.add(when: 'CONFIG_VIRTIO', if_false: files('virtio-stub.c')) -system_ss.add(when: ['CONFIG_VIRTIO_MD', 'CONFIG_VIRTIO_PCI'], - if_false: files('virtio-md-stubs.c')) +stub_ss.add(files('vhost-stub.c')) +stub_ss.add(files('virtio-stub.c')) +stub_ss.add(files('virtio-md-stubs.c')) system_ss.add(files('virtio-hmp-cmds.c')) -- 2.52.0
