[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v8 107/152] meson: convert hw/rdma
From: |
Paolo Bonzini |
Subject: |
[PULL v8 107/152] meson: convert hw/rdma |
Date: |
Fri, 21 Aug 2020 06:22:44 -0400 |
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/Makefile.objs | 1 -
hw/meson.build | 1 +
hw/rdma/Makefile.objs | 3 ---
hw/rdma/meson.build | 10 ++++++++++
4 files changed, 11 insertions(+), 4 deletions(-)
delete mode 100644 hw/rdma/Makefile.objs
create mode 100644 hw/rdma/meson.build
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index 78860ae9c7..748a718b0f 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -19,7 +19,6 @@ devices-dirs-$(CONFIG_IPMI) += ipmi/
devices-dirs-y += isa/
devices-dirs-y += misc/
devices-dirs-y += net/
-devices-dirs-y += rdma/
endif
common-obj-y += $(devices-dirs-y)
diff --git a/hw/meson.build b/hw/meson.build
index 0bdd6a2613..f704e51361 100644
--- a/hw/meson.build
+++ b/hw/meson.build
@@ -6,6 +6,7 @@ subdir('pci')
subdir('pci-bridge')
subdir('pci-host')
subdir('pcmcia')
+subdir('rdma')
subdir('rtc')
subdir('scsi')
subdir('sd')
diff --git a/hw/rdma/Makefile.objs b/hw/rdma/Makefile.objs
deleted file mode 100644
index 819bb12a35..0000000000
--- a/hw/rdma/Makefile.objs
+++ /dev/null
@@ -1,3 +0,0 @@
-obj-$(CONFIG_VMW_PVRDMA) += rdma_utils.o rdma_backend.o rdma_rm.o rdma.o
-obj-$(CONFIG_VMW_PVRDMA) += vmw/pvrdma_dev_ring.o vmw/pvrdma_cmd.o \
- vmw/pvrdma_qp_ops.o vmw/pvrdma_main.o
diff --git a/hw/rdma/meson.build b/hw/rdma/meson.build
new file mode 100644
index 0000000000..7325f40c32
--- /dev/null
+++ b/hw/rdma/meson.build
@@ -0,0 +1,10 @@
+specific_ss.add(when: 'CONFIG_VMW_PVRDMA', if_true: files(
+ 'rdma.c',
+ 'rdma_backend.c',
+ 'rdma_rm.c',
+ 'rdma_utils.c',
+ 'vmw/pvrdma_cmd.c',
+ 'vmw/pvrdma_dev_ring.c',
+ 'vmw/pvrdma_main.c',
+ 'vmw/pvrdma_qp_ops.c',
+))
--
2.26.2
- [PULL v8 094/152] meson: convert hw/vfio, (continued)
- [PULL v8 094/152] meson: convert hw/vfio, Paolo Bonzini, 2020/08/21
- [PULL v8 097/152] meson: convert hw/timer, Paolo Bonzini, 2020/08/21
- [PULL v8 095/152] meson: convert hw/usb, Paolo Bonzini, 2020/08/21
- [PULL v8 100/152] meson: convert hw/sd, Paolo Bonzini, 2020/08/21
- [PULL v8 088/152] meson: convert hw/semihosting, Paolo Bonzini, 2020/08/21
- [PULL v8 099/152] meson: convert hw/ssi, Paolo Bonzini, 2020/08/21
- [PULL v8 101/152] meson: convert hw/scsi, Paolo Bonzini, 2020/08/21
- [PULL v8 102/152] meson: convert hw/pcmcia, Paolo Bonzini, 2020/08/21
- [PULL v8 108/152] meson: convert hw/net, Paolo Bonzini, 2020/08/21
- [PULL v8 105/152] meson: convert hw/pci, Paolo Bonzini, 2020/08/21
- [PULL v8 107/152] meson: convert hw/rdma,
Paolo Bonzini <=
- [PULL v8 104/152] meson: convert hw/pci-bridge, Paolo Bonzini, 2020/08/21
- [PULL v8 103/152] meson: convert hw/pci-host, Paolo Bonzini, 2020/08/21
- [PULL v8 109/152] meson: convert hw/misc, Paolo Bonzini, 2020/08/21
- [PULL v8 116/152] meson: convert hw/i2c, Paolo Bonzini, 2020/08/21
- [PULL v8 112/152] meson: convert hw/ipack, Paolo Bonzini, 2020/08/21
- [PULL v8 110/152] meson: convert hw/isa, Paolo Bonzini, 2020/08/21
- [PULL v8 106/152] meson: convert hw/nvram, Paolo Bonzini, 2020/08/21
- [PULL v8 092/152] meson: convert hw/watchdog, Paolo Bonzini, 2020/08/21
- [PULL v8 115/152] meson: convert hw/ide, Paolo Bonzini, 2020/08/21
- [PULL v8 117/152] meson: convert hw/hyperv, Paolo Bonzini, 2020/08/21