[v3] Meson integration for 5.2

[PATCH 105/150] meson: convert hw/rdma

Paolo Bonzini posted 150 patches 5 years, 5 months ago

Diff against v1 v1 v2
Download mbox

Maintainers: Cornelia Huck <cohuck@redhat.com>, Christian Schoenebeck <qemu_oss@crudebyte.com>, Anthony Perard <anthony.perard@citrix.com>, Bastian Koppelmann <kbastian@mail.uni-paderborn.de>, Ben Warren <ben@skyportsystems.com>, Sagar Karandikar <sagark@eecs.berkeley.edu>, Michael Roth <mdroth@linux.vnet.ibm.com>, "Michael S. Tsirkin" <mst@redhat.com>, John Snow <jsnow@redhat.com>, Greg Kurz <groug@kaod.org>, Aurelien Jarno <aurelien@aurel32.net>, Stefano Stabellini <sstabellini@kernel.org>, Jiaxun Yang <jiaxun.yang@flygoat.com>, "Daniel P. Berrangé" <berrange@redhat.com>, Joel Stanley <joel@jms.id.au>, Keith Busch <kbusch@kernel.org>, "Edgar E. Iglesias" <edgar.iglesias@gmail.com>, Thomas Huth <thuth@redhat.com>, Laurent Vivier <laurent@vivier.eu>, Su Hang <suhang16@mails.ucas.ac.cn>, Hannes Reinecke <hare@suse.com>, David Gibson <david@gibson.dropbear.id.au>, Fam Zheng <fam@euphon.net>, Christian Borntraeger <borntraeger@de.ibm.com>, "Alex Bennée" <alex.bennee@linaro.org>, Wainer dos Santos Moschetta <wainersm@redhat.com>, Alex Williamson <alex.williamson@redhat.com>, "Dr. David Alan Gilbert" <dgilbert@redhat.com>, Helge Deller <deller@gmx.de>, Stefan Berger <stefanb@linux.ibm.com>, Igor Mammedov <imammedo@redhat.com>, Laszlo Ersek <lersek@redhat.com>, Amit Shah <amit@kernel.org>, Yoshinori Sato <ysato@users.sourceforge.jp>, Riku Voipio <riku.voipio@iki.fi>, Max Filippov <jcmvbkbc@gmail.com>, Cleber Rosa <crosa@redhat.com>, Stafford Horne <shorne@gmail.com>, Richard Henderson <rth@twiddle.net>, Markus Armbruster <armbru@redhat.com>, Halil Pasic <pasic@linux.ibm.com>, Alexander Bulekov <alxndr@bu.edu>, Artyom Tarasenko <atar4qemu@gmail.com>, Gerd Hoffmann <kraxel@redhat.com>, Juan Quintela <quintela@redhat.com>, David Hildenbrand <david@redhat.com>, Aleksandar Rikalo <aleksandar.rikalo@syrmia.com>, "Cédric Le Goater" <clg@kaod.org>, Bandan Das <bsd@redhat.com>, Marcel Apfelbaum <marcel.apfelbaum@gmail.com>, Palmer Dabbelt <palmer@dabbelt.com>, Jason Wang <jasowang@redhat.com>, Michael Rolnik <mrolnik@gmail.com>, Sarah Harris <S.E.Harris@kent.ac.uk>, Alistair Francis <Alistair.Francis@wdc.com>, Paolo Bonzini <pbonzini@redhat.com>, Max Reitz <mreitz@redhat.com>, Stefan Weil <sw@weilnetz.de>, Laurent Vivier <lvivier@redhat.com>, Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>, "Philippe Mathieu-Daudé" <philmd@redhat.com>, Andrzej Zaborowski <balrogg@gmail.com>, Paul Durrant <paul@xen.org>, Kevin Wolf <kwolf@redhat.com>, "Marc-André Lureau" <marcandre.lureau@redhat.com>, Raphael Norwitz <raphael.norwitz@nutanix.com>, Dmitry Fleytman <dmitry.fleytman@gmail.com>, Peter Maydell <peter.maydell@linaro.org>, Yuval Shaia <yuval.shaia.ml@gmail.com>, Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>, Huacai Chen <chenhc@lemote.com>, Stefan Hajnoczi <stefanha@redhat.com>, Eric Blake <eblake@redhat.com>, Eduardo Habkost <ehabkost@redhat.com>

Expand all Fold all

[PATCH 105/150] meson: convert hw/rdma

Posted by Paolo Bonzini 5 years, 5 months ago

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/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

Re: [PATCH 105/150] meson: convert hw/rdma

Posted by Philippe Mathieu-Daudé 5 years, 5 months ago

On 8/17/20 4:40 PM, Paolo Bonzini wrote:
> 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/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',
> +))
> 

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>