[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 077/142] meson: convert hw/vfio
From: |
Paolo Bonzini |
Subject: |
[PATCH 077/142] meson: convert hw/vfio |
Date: |
Tue, 28 Jan 2020 18:52:37 +0100 |
From: Marc-André Lureau <address@hidden>
Signed-off-by: Marc-André Lureau <address@hidden>
---
hw/Makefile.objs | 1 -
hw/meson.build | 1 +
hw/vfio/Makefile.objs | 7 -------
hw/vfio/meson.build | 17 +++++++++++++++++
4 files changed, 18 insertions(+), 8 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 742b310f13..cbd4e07fe5 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 abad8b818c..0000000000
--- a/hw/vfio/Makefile.objs
+++ /dev/null
@@ -1,7 +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
diff --git a/hw/vfio/meson.build b/hw/vfio/meson.build
new file mode 100644
index 0000000000..b9a31caf74
--- /dev/null
+++ b/hw/vfio/meson.build
@@ -0,0 +1,17 @@
+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'))
+
+specific_ss.add_all(when: 'CONFIG_VFIO', if_true: vfio_ss)
--
2.21.0
- [PATCH 069/142] meson: convert hw/xen, (continued)
- [PATCH 069/142] meson: convert hw/xen, Paolo Bonzini, 2020/01/28
- [PATCH 070/142] meson: convert hw/core, Paolo Bonzini, 2020/01/28
- [PATCH 071/142] meson: convert hw/semihosting, Paolo Bonzini, 2020/01/28
- [PATCH 072/142] meson: convert hw/nubus, Paolo Bonzini, 2020/01/28
- [PATCH 073/142] meson: convert hw/smbios, Paolo Bonzini, 2020/01/28
- [PATCH 074/142] meson: convert hw/mem, Paolo Bonzini, 2020/01/28
- [PATCH 075/142] meson: convert hw/watchdog, Paolo Bonzini, 2020/01/28
- [PATCH 076/142] meson: convert hw/virtio, Paolo Bonzini, 2020/01/28
- [PATCH 078/142] meson: convert hw/usb, Paolo Bonzini, 2020/01/28
- [PATCH 079/142] meson: convert hw/tpm, Paolo Bonzini, 2020/01/28
- [PATCH 077/142] meson: convert hw/vfio,
Paolo Bonzini <=
- [PATCH 080/142] meson: convert hw/timer, Paolo Bonzini, 2020/01/28
- [PATCH 081/142] meson: convert hw/rtc, Paolo Bonzini, 2020/01/28
- [PATCH 082/142] meson: convert hw/ssi, Paolo Bonzini, 2020/01/28
- [PATCH 083/142] meson: convert hw/sd, Paolo Bonzini, 2020/01/28
- [PATCH 084/142] meson: convert hw/scsi, Paolo Bonzini, 2020/01/28
- [PATCH 085/142] meson: convert hw/pcmcia, Paolo Bonzini, 2020/01/28
- [PATCH 086/142] meson: convert hw/pci-host, Paolo Bonzini, 2020/01/28
- [PATCH 087/142] meson: convert hw/pci-bridge, Paolo Bonzini, 2020/01/28
- [PATCH 088/142] meson: convert hw/pci, Paolo Bonzini, 2020/01/28
- [PATCH 089/142] meson: convert hw/nvram, Paolo Bonzini, 2020/01/28