public/qemu
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

scsi/qemu-pr-helper: Drop support for 'old' libmultipath API

Browse source 
Commit 1b0578f5c4 ("qemu-pr-helper: Fix build on CentOS 7") added
code to probe for 'old' libmultipath API on CentOS 7. However since
merge commit 8c345b3e6a (June 2021) we don't build/test CentOS 7 as
it felt out of our list of supported distrib versions. Therefore we
can safely remove the 'old' API check (mostly reverting commit
1b0578f5c4, except the code got converted to meson in commit
6ec0e15d95 "meson: move libmpathpersist test").

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20230605174146.87440-2-philmd@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Philippe Mathieu-Daudé 2023-06-05 19:41:45 +02:00 committed by Paolo Bonzini
parent 6da5f22b65
commit 6b40847ab4
2 changed files with 2 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
meson.build
View file

@ -1092,9 +1092,8 @@ endif
mpathlibs = [libudev] mpathlibs = [libudev]
mpathpersist = not_found mpathpersist = not_found
mpathpersist_new_api = false
if targetos == 'linux' and have_tools and get_option('mpath').allowed() if targetos == 'linux' and have_tools and get_option('mpath').allowed()
mpath_test_source_new = ''' mpath_test_source = '''
#include <libudev.h> #include <libudev.h>
#include <mpath_persist.h> #include <mpath_persist.h>
unsigned mpath_mx_alloc_len = 1024; unsigned mpath_mx_alloc_len = 1024;
@ -1111,16 +1110,6 @@ if targetos == 'linux' and have_tools and get_option('mpath').allowed()
multipath_conf = mpath_lib_init(); multipath_conf = mpath_lib_init();
return 0; return 0;
}''' }'''
mpath_test_source_old = '''
#include <libudev.h>
#include <mpath_persist.h>
unsigned mpath_mx_alloc_len = 1024;
int logsink;
int main(void) {
struct udev *udev = udev_new();
mpath_lib_init(udev);
return 0;
}'''
libmpathpersist = cc.find_library('mpathpersist', libmpathpersist = cc.find_library('mpathpersist',
required: get_option('mpath')) required: get_option('mpath'))
if libmpathpersist.found() if libmpathpersist.found()
@ -1139,10 +1128,7 @@ if targetos == 'linux' and have_tools and get_option('mpath').allowed()
endforeach endforeach
if mpathlibs.length() == 0 if mpathlibs.length() == 0
msg = 'Dependencies missing for libmpathpersist' msg = 'Dependencies missing for libmpathpersist'
elif cc.links(mpath_test_source_new, dependencies: mpathlibs) elif cc.links(mpath_test_source, dependencies: mpathlibs)
mpathpersist = declare_dependency(dependencies: mpathlibs)
mpathpersist_new_api = true
elif cc.links(mpath_test_source_old, dependencies: mpathlibs)
mpathpersist = declare_dependency(dependencies: mpathlibs) mpathpersist = declare_dependency(dependencies: mpathlibs)
else else
msg = 'Cannot detect libmpathpersist API' msg = 'Cannot detect libmpathpersist API'
@ -2094,7 +2080,6 @@ config_host_data.set('CONFIG_GCOV', get_option('b_coverage'))
config_host_data.set('CONFIG_LIBUDEV', libudev.found()) config_host_data.set('CONFIG_LIBUDEV', libudev.found())
config_host_data.set('CONFIG_LZO', lzo.found()) config_host_data.set('CONFIG_LZO', lzo.found())
config_host_data.set('CONFIG_MPATH', mpathpersist.found()) config_host_data.set('CONFIG_MPATH', mpathpersist.found())
config_host_data.set('CONFIG_MPATH_NEW_API', mpathpersist_new_api)
config_host_data.set('CONFIG_BLKIO', blkio.found()) config_host_data.set('CONFIG_BLKIO', blkio.found())
if blkio.found() if blkio.found()
config_host_data.set('CONFIG_BLKIO_VHOST_VDPA_FD', config_host_data.set('CONFIG_BLKIO_VHOST_VDPA_FD',

4
scsi/qemu-pr-helper.c
View file

@ -280,11 +280,7 @@ void put_multipath_config(struct config *conf)
static void multipath_pr_init(void) static void multipath_pr_init(void)
{ {
udev = udev_new(); udev = udev_new();
#ifdef CONFIG_MPATH_NEW_API
multipath_conf = mpath_lib_init(); multipath_conf = mpath_lib_init();
#else
mpath_lib_init(udev);
#endif
} }
static int is_mpath(int fd) static int is_mpath(int fd)