Manos Pitsidianakis <manos.pitsidiana...@linaro.org> writes:
> On Mon, 09 Oct 2023 12:59, Alex Bennée <alex.ben...@linaro.org> wrote: >>diff --git a/hw/virtio/meson.build b/hw/virtio/meson.build >>index 51c3f97c2d..d0b963199c 100644 >>--- a/hw/virtio/meson.build >>+++ b/hw/virtio/meson.build >>@@ -18,8 +18,15 @@ if have_vhost >> # fixme - this really should be generic >> specific_virtio_ss.add(files('vhost-user.c')) >> system_virtio_ss.add(files('vhost-user-base.c')) >>+ >>+ # MMIO Stubs >> system_virtio_ss.add(files('vhost-user-device.c')) >>+ system_virtio_ss.add(when: 'CONFIG_VHOST_USER_RNG', if_true: >>files('vhost-user-rng.c')) >>+ >>+ # PCI Stubs >> system_virtio_ss.add(when: 'CONFIG_VIRTIO_PCI', if_true: >> files('vhost-user-device-pci.c')) >>+ system_virtio_ss.add(when: ['CONFIG_VIRTIO_PCI', >>'CONFIG_VHOST_USER_RNG'], >>+ if_true: files('vhost-user-rng-pci.c')) > > Is there a reason why the target was moved to system_virtio_ss from > virtio_pci_ss? So we build it once, virtio_pci_ss is still: specific_virtio_ss.add_all(when: 'CONFIG_VIRTIO_PCI', if_true: virtio_pci_ss) which means we build it once for every target which is overkill. > >> endif >> if have_vhost_vdpa >> system_virtio_ss.add(files('vhost-vdpa.c')) >>@@ -34,10 +41,8 @@ specific_virtio_ss.add(when: 'CONFIG_VHOST_USER_FS', >>if_true: files('vhost-user- >> specific_virtio_ss.add(when: 'CONFIG_VIRTIO_PMEM', if_true: >> files('virtio-pmem.c')) >> specific_virtio_ss.add(when: 'CONFIG_VHOST_VSOCK', if_true: >> files('vhost-vsock.c')) >> specific_virtio_ss.add(when: 'CONFIG_VHOST_USER_VSOCK', if_true: >> files('vhost-user-vsock.c')) >>-specific_virtio_ss.add(when: 'CONFIG_VIRTIO_RNG', if_true: >>files('virtio-rng.c')) > > Was this accidental? It's not added anywhere else, only deleted. Oops yes. Didn't mean to delete the in-tree emulation. Will fix. > >> @@ -57,7 +61,6 @@ virtio_pci_ss.add(when: 'CONFIG_VHOST_USER_FS', >> if_true: files('vhost-user-fs-pc >> virtio_pci_ss.add(when: 'CONFIG_VIRTIO_CRYPTO', if_true: >> files('virtio-crypto-pci.c')) >> virtio_pci_ss.add(when: 'CONFIG_VIRTIO_INPUT_HOST', if_true: >> files('virtio-input-host-pci.c')) >> virtio_pci_ss.add(when: 'CONFIG_VIRTIO_INPUT', if_true: >> files('virtio-input-pci.c')) >>-virtio_pci_ss.add(when: 'CONFIG_VIRTIO_RNG', if_true: >>files('virtio-rng-pci.c')) >> virtio_pci_ss.add(when: 'CONFIG_VIRTIO_BALLOON', if_true: >> files('virtio-balloon-pci.c')) >> virtio_pci_ss.add(when: 'CONFIG_VIRTIO_9P', if_true: >> files('virtio-9p-pci.c')) >> virtio_pci_ss.add(when: 'CONFIG_VIRTIO_SCSI', if_true: >> files('virtio-scsi-pci.c')) > > Same here > > Manos -- Alex Bennée Virtualisation Tech Lead @ Linaro