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

[Philippe Mathieu-Daudé]

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>