External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-31 05:57:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

m4: virt-sanlock: drop check for sanlock_killpath()

Browse Source 
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:
Pavel Hrdina 2020-06-24 00:15:15 +02:00
parent c495169478
commit ab7204d908
2 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
m4/virt-sanlock.m4
View File

@ -30,13 +30,6 @@ AC_DEFUN([LIBVIRT_CHECK_SANLOCK],[
CPPFLAGS="$CPPFLAGS $SANLOCK_CFLAGS"
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 sanlock_write_lockspace has been introduced 2 releases after
dnl sanlock_add_lockspace_timeout therefore if sanlock_write_lockspace is found

13
src/locking/lock_driver_sanlock.c
View File

@ -812,7 +812,6 @@ static int virLockManagerSanlockAddResource(virLockManagerPtr lock,
return 0;
}
#if HAVE_SANLOCK_KILLPATH
static int
virLockManagerSanlockRegisterKillscript(int sock,
const char *vmuri,
@ -894,18 +893,6 @@ virLockManagerSanlockRegisterKillscript(int sock,
VIR_FREE(args);
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,
const char *state,