[PATCH] meson: Remove libumad dependence

zhenwei pi posted 1 patch 1 month ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20240611082407.57154-1-pizhenwei@bytedance.com
Maintainers: Paolo Bonzini <pbonzini@redhat.com>, "Marc-André Lureau" <marcandre.lureau@redhat.com>, "Daniel P. Berrangé" <berrange@redhat.com>, Thomas Huth <thuth@redhat.com>, "Philippe Mathieu-Daudé" <philmd@linaro.org>
meson.build | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
[PATCH] meson: Remove libumad dependence
Posted by zhenwei pi 1 month ago
RDMA based migration has no dependence on libumad, libibverbs and
librdmacm are enough.
libumad was used by rdmacm-mux which has been already removed. It's
remained mistakenly.

Fixes: 1dfd42c4264b ("hw/rdma: Remove deprecated pvrdma device and rdmacm-mux helper")
Cc: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: zhenwei pi <pizhenwei@bytedance.com>
---
 meson.build | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/meson.build b/meson.build
index ec59effca2..226b97ea26 100644
--- a/meson.build
+++ b/meson.build
@@ -1885,11 +1885,9 @@ endif
 
 rdma = not_found
 if not get_option('rdma').auto() or have_system
-  libumad = cc.find_library('ibumad', required: get_option('rdma'))
   rdma_libs = [cc.find_library('rdmacm', has_headers: ['rdma/rdma_cma.h'],
                                required: get_option('rdma')),
-               cc.find_library('ibverbs', required: get_option('rdma')),
-               libumad]
+               cc.find_library('ibverbs', required: get_option('rdma'))]
   rdma = declare_dependency(dependencies: rdma_libs)
   foreach lib: rdma_libs
     if not lib.found()
-- 
2.34.1


Re: [PATCH] meson: Remove libumad dependence
Posted by Philippe Mathieu-Daudé 1 month ago
On 11/6/24 10:24, zhenwei pi wrote:
> RDMA based migration has no dependence on libumad, libibverbs and
> librdmacm are enough.
> libumad was used by rdmacm-mux which has been already removed. It's
> remained mistakenly.

Great!

Please also update tests/lcitool/projects/qemu.yml, with that:
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>

> Fixes: 1dfd42c4264b ("hw/rdma: Remove deprecated pvrdma device and rdmacm-mux helper")
> Cc: Philippe Mathieu-Daudé <philmd@linaro.org>
> Signed-off-by: zhenwei pi <pizhenwei@bytedance.com>
> ---
>   meson.build | 4 +---
>   1 file changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/meson.build b/meson.build
> index ec59effca2..226b97ea26 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -1885,11 +1885,9 @@ endif
>   
>   rdma = not_found
>   if not get_option('rdma').auto() or have_system
> -  libumad = cc.find_library('ibumad', required: get_option('rdma'))
>     rdma_libs = [cc.find_library('rdmacm', has_headers: ['rdma/rdma_cma.h'],
>                                  required: get_option('rdma')),
> -               cc.find_library('ibverbs', required: get_option('rdma')),
> -               libumad]
> +               cc.find_library('ibverbs', required: get_option('rdma'))]
>     rdma = declare_dependency(dependencies: rdma_libs)
>     foreach lib: rdma_libs
>       if not lib.found()


Re: [PATCH] meson: Remove libumad dependence
Posted by Philippe Mathieu-Daudé 1 month ago
On 11/6/24 11:09, Philippe Mathieu-Daudé wrote:
> On 11/6/24 10:24, zhenwei pi wrote:
>> RDMA based migration has no dependence on libumad, libibverbs and
>> librdmacm are enough.
>> libumad was used by rdmacm-mux which has been already removed. It's
>> remained mistakenly.
> 
> Great!
> 
> Please also update tests/lcitool/projects/qemu.yml,

(see 
https://www.qemu.org/docs/master/devel/testing#adding-new-build-pre-requisites)

> with that:
> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> 
>> Fixes: 1dfd42c4264b ("hw/rdma: Remove deprecated pvrdma device and 
>> rdmacm-mux helper")
>> Cc: Philippe Mathieu-Daudé <philmd@linaro.org>
>> Signed-off-by: zhenwei pi <pizhenwei@bytedance.com>
>> ---
>>   meson.build | 4 +---
>>   1 file changed, 1 insertion(+), 3 deletions(-)
>>
>> diff --git a/meson.build b/meson.build
>> index ec59effca2..226b97ea26 100644
>> --- a/meson.build
>> +++ b/meson.build
>> @@ -1885,11 +1885,9 @@ endif
>>   rdma = not_found
>>   if not get_option('rdma').auto() or have_system
>> -  libumad = cc.find_library('ibumad', required: get_option('rdma'))
>>     rdma_libs = [cc.find_library('rdmacm', has_headers: 
>> ['rdma/rdma_cma.h'],
>>                                  required: get_option('rdma')),
>> -               cc.find_library('ibverbs', required: get_option('rdma')),
>> -               libumad]
>> +               cc.find_library('ibverbs', required: get_option('rdma'))]
>>     rdma = declare_dependency(dependencies: rdma_libs)
>>     foreach lib: rdma_libs
>>       if not lib.found()
>