mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-03-20 07:59:00 +00:00
m4: virt-sanlock: drop check for sanlock_killpath()
Function sanlock_killpath() was introduced in 2.4 version and had modified one of the arguments from `char *` into `const char *` in version 2.7. All of this is available in all supported OSes. Signed-off-by: Pavel Hrdina <phrdina@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
parent
c495169478
commit
ab7204d908
@ -30,13 +30,6 @@ AC_DEFUN([LIBVIRT_CHECK_SANLOCK],[
|
|||||||
CPPFLAGS="$CPPFLAGS $SANLOCK_CFLAGS"
|
CPPFLAGS="$CPPFLAGS $SANLOCK_CFLAGS"
|
||||||
LIBS="$LIBS $SANLOCK_LIBS"
|
LIBS="$LIBS $SANLOCK_LIBS"
|
||||||
|
|
||||||
AC_CHECK_LIB([sanlock_client], [sanlock_killpath],
|
|
||||||
[sanlock_killpath=yes], [sanlock_killpath=no])
|
|
||||||
if test "x$sanlock_killpath" = "xyes" ; then
|
|
||||||
AC_DEFINE_UNQUOTED([HAVE_SANLOCK_KILLPATH], 1,
|
|
||||||
[whether Sanlock supports sanlock_killpath])
|
|
||||||
fi
|
|
||||||
|
|
||||||
dnl Ideally, we would check for sanlock_add_lockspace_timeout here too, but
|
dnl Ideally, we would check for sanlock_add_lockspace_timeout here too, but
|
||||||
dnl sanlock_write_lockspace has been introduced 2 releases after
|
dnl sanlock_write_lockspace has been introduced 2 releases after
|
||||||
dnl sanlock_add_lockspace_timeout therefore if sanlock_write_lockspace is found
|
dnl sanlock_add_lockspace_timeout therefore if sanlock_write_lockspace is found
|
||||||
|
@ -812,7 +812,6 @@ static int virLockManagerSanlockAddResource(virLockManagerPtr lock,
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
#if HAVE_SANLOCK_KILLPATH
|
|
||||||
static int
|
static int
|
||||||
virLockManagerSanlockRegisterKillscript(int sock,
|
virLockManagerSanlockRegisterKillscript(int sock,
|
||||||
const char *vmuri,
|
const char *vmuri,
|
||||||
@ -894,18 +893,6 @@ virLockManagerSanlockRegisterKillscript(int sock,
|
|||||||
VIR_FREE(args);
|
VIR_FREE(args);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
#else
|
|
||||||
static int
|
|
||||||
virLockManagerSanlockRegisterKillscript(int sock G_GNUC_UNUSED,
|
|
||||||
const char *vmuri G_GNUC_UNUSED,
|
|
||||||
const char *uuidstr G_GNUC_UNUSED,
|
|
||||||
virDomainLockFailureAction action G_GNUC_UNUSED)
|
|
||||||
{
|
|
||||||
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
|
|
||||||
_("sanlock is too old to support lock failure action"));
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
static int virLockManagerSanlockAcquire(virLockManagerPtr lock,
|
static int virLockManagerSanlockAcquire(virLockManagerPtr lock,
|
||||||
const char *state,
|
const char *state,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user