diff options
| author | Murilo Opsfelder Araujo <muriloo@linux.ibm.com> | 2018-08-10 11:11:16 -0300 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2018-08-23 13:32:50 +0200 |
| commit | 1b0578f5c455d5a95384752ef9ffa8825efaf8ee (patch) | |
| tree | 18ac5c68e46bc0ea0ea1d87e870da389088386e0 /scsi/qemu-pr-helper.c | |
| parent | 1a5c63ce88e92de163c592505c2e2153476b9345 (diff) | |
| download | qemu-1b0578f5c455d5a95384752ef9ffa8825efaf8ee.zip qemu-1b0578f5c455d5a95384752ef9ffa8825efaf8ee.tar.gz qemu-1b0578f5c455d5a95384752ef9ffa8825efaf8ee.tar.bz2 | |
qemu-pr-helper: Fix build on CentOS 7
After commit b3f1c8c413bc83e4a2cc7a63e4eddf9fe6449052 "qemu-pr-helper: use new
libmultipath API", QEMU started using new libmultipath API, which is not
available on CentOS 7.x.
This fixes that by probing the new libmultipath API in configure. If it fails,
then try probing the old API. If it fails, then consider libmultipath not
available.
With this, configure script defines CONFIG_MPATH_NEW_API that is used in
scsi/qemu-pr-helper.c to use the new libmultipath API.
Fixes: b3f1c8c413bc83e4a2cc7a63e4eddf9fe6449052
BugLink: https://bugs.launchpad.net/qemu/+bug/1786343
Signed-off-by: Murilo Opsfelder Araujo <muriloo@linux.ibm.com>
Message-Id: <20180810141116.24016-1-muriloo@linux.ibm.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'scsi/qemu-pr-helper.c')
| -rw-r--r-- | scsi/qemu-pr-helper.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/scsi/qemu-pr-helper.c b/scsi/qemu-pr-helper.c index 1528a71..ed037aa 100644 --- a/scsi/qemu-pr-helper.c +++ b/scsi/qemu-pr-helper.c @@ -301,7 +301,11 @@ void put_multipath_config(struct config *conf) static void multipath_pr_init(void) { udev = udev_new(); +#ifdef CONFIG_MPATH_NEW_API multipath_conf = mpath_lib_init(); +#else + mpath_lib_init(udev); +#endif } static int is_mpath(int fd) |