On 8/17/20 4:36 PM, Paolo Bonzini wrote:
> From: Marc-André Lureau <marcandre.lur...@redhat.com>
>
> Signed-off-by: Marc-André Lureau <marcandre.lur...@redhat.com>
> Signed-off-by: Paolo Bonzini <pbonz...@redhat.com>
> ---
> hw/Makefile.objs | 1 -
> hw/meson.build | 1 +
> hw/vfio/Makefile.objs | 8 --------
> hw/vfio/meson.build | 18 ++++++++++++++++++
> 4 files changed, 19 insertions(+), 9 deletions(-)
> delete mode 100644 hw/vfio/Makefile.objs
> create mode 100644 hw/vfio/meson.build
>
> diff --git a/hw/Makefile.objs b/hw/Makefile.objs
> index a1cfb99334..f6e08f6660 100644
> --- a/hw/Makefile.objs
> +++ b/hw/Makefile.objs
> @@ -31,7 +31,6 @@ devices-dirs-y += ssi/
> devices-dirs-y += timer/
> devices-dirs-$(CONFIG_TPM) += tpm/
> devices-dirs-y += usb/
> -devices-dirs-$(CONFIG_VFIO) += vfio/
> endif
>
> common-obj-y += $(devices-dirs-y)
> diff --git a/hw/meson.build b/hw/meson.build
> index 8338fc4408..4dafc8a08e 100644
> --- a/hw/meson.build
> +++ b/hw/meson.build
> @@ -3,6 +3,7 @@ subdir('mem')
> subdir('nubus')
> subdir('semihosting')
> subdir('smbios')
> +subdir('vfio')
> subdir('virtio')
> subdir('watchdog')
> subdir('xen')
> diff --git a/hw/vfio/Makefile.objs b/hw/vfio/Makefile.objs
> deleted file mode 100644
> index 9bb1c09e84..0000000000
> --- a/hw/vfio/Makefile.objs
> +++ /dev/null
> @@ -1,8 +0,0 @@
> -obj-y += common.o spapr.o
> -obj-$(CONFIG_VFIO_PCI) += pci.o pci-quirks.o display.o
> -obj-$(CONFIG_VFIO_CCW) += ccw.o
> -obj-$(CONFIG_VFIO_PLATFORM) += platform.o
> -obj-$(CONFIG_VFIO_XGMAC) += calxeda-xgmac.o
> -obj-$(CONFIG_VFIO_AMD_XGBE) += amd-xgbe.o
> -obj-$(CONFIG_VFIO_AP) += ap.o
> -obj-$(CONFIG_VFIO_IGD) += igd.o
> diff --git a/hw/vfio/meson.build b/hw/vfio/meson.build
> new file mode 100644
> index 0000000000..37efa74018
> --- /dev/null
> +++ b/hw/vfio/meson.build
> @@ -0,0 +1,18 @@
> +vfio_ss = ss.source_set()
> +vfio_ss.add(files(
> + 'common.c',
> + 'spapr.c',
> +))
> +vfio_ss.add(when: 'CONFIG_VFIO_PCI', if_true: files(
> + 'display.c',
> + 'pci-quirks.c',
> + 'pci.c',
> +))
> +vfio_ss.add(when: 'CONFIG_VFIO_CCW', if_true: files('ccw.c'))
> +vfio_ss.add(when: 'CONFIG_VFIO_PLATFORM', if_true: files('platform.c'))
> +vfio_ss.add(when: 'CONFIG_VFIO_XGMAC', if_true: files('calxeda-xgmac.c'))
> +vfio_ss.add(when: 'CONFIG_VFIO_AMD_XGBE', if_true: files('amd-xgbe.c'))
> +vfio_ss.add(when: 'CONFIG_VFIO_AP', if_true: files('ap.c'))
> +vfio_ss.add(when: 'CONFIG_VFIO_IGD', if_true: files('igd.c'))
Not sorted :)
Reviewed-by: Philippe Mathieu-Daudé <phi...@redhat.com>
> +
> +specific_ss.add_all(when: 'CONFIG_VFIO', if_true: vfio_ss)
>
