[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 093/150] meson: convert hw/vfio
From: |
Paolo Bonzini |
Subject: |
[PULL 093/150] meson: convert hw/vfio |
Date: |
Tue, 18 Aug 2020 10:09:28 -0400 |
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@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'))
+
+specific_ss.add_all(when: 'CONFIG_VFIO', if_true: vfio_ss)
--
2.26.2
- [PULL 086/150] meson: convert hw/core, (continued)
- [PULL 086/150] meson: convert hw/core, Paolo Bonzini, 2020/08/18
- [PULL 088/150] meson: convert hw/nubus, Paolo Bonzini, 2020/08/18
- [PULL 090/150] meson: convert hw/mem, Paolo Bonzini, 2020/08/18
- [PULL 084/150] meson: convert qapi-specific to meson, Paolo Bonzini, 2020/08/18
- [PULL 089/150] meson: convert hw/smbios, Paolo Bonzini, 2020/08/18
- [PULL 091/150] meson: convert hw/watchdog, Paolo Bonzini, 2020/08/18
- [PULL 099/150] meson: convert hw/sd, Paolo Bonzini, 2020/08/18
- [PULL 096/150] meson: convert hw/timer, Paolo Bonzini, 2020/08/18
- [PULL 087/150] meson: convert hw/semihosting, Paolo Bonzini, 2020/08/18
- [PULL 080/150] meson: convert net directory to Meson, Paolo Bonzini, 2020/08/18
- [PULL 093/150] meson: convert hw/vfio,
Paolo Bonzini <=
- [PULL 095/150] meson: convert hw/tpm, Paolo Bonzini, 2020/08/18
- [PULL 092/150] meson: convert hw/virtio, Paolo Bonzini, 2020/08/18
- [PULL 097/150] meson: convert hw/rtc, Paolo Bonzini, 2020/08/18
- [PULL 061/150] meson: infrastructure for building emulators, Paolo Bonzini, 2020/08/18
- [PULL 100/150] meson: convert hw/scsi, Paolo Bonzini, 2020/08/18
- [PULL 098/150] meson: convert hw/ssi, Paolo Bonzini, 2020/08/18
- [PULL 083/150] meson: convert disas directory to Meson, Paolo Bonzini, 2020/08/18
- [PULL 111/150] meson: convert hw/ipack, Paolo Bonzini, 2020/08/18
- [PULL 107/150] meson: convert hw/net, Paolo Bonzini, 2020/08/18
- [PULL 071/150] meson: convert ui directory to Meson, Paolo Bonzini, 2020/08/18