mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-22 05:35:25 +00:00
avoid using deprecated udev logging functions
In systemd >= 218, the udev_set_log_fn method has been marked
deprecated and turned into a no-op. Nothing in the udev client
library will print to stderr by default anymore, so we can
just stop installing a logging hook for new enough udev.
(cherry picked from commit a93a3b975c
)
This commit is contained in:
parent
271ac72963
commit
0e436ed0f0
@ -24,6 +24,13 @@ AC_DEFUN([LIBVIRT_CHECK_UDEV],[
|
||||
if test "$with_udev" = "yes" && test "$with_pciaccess" != "yes" ; then
|
||||
AC_MSG_ERROR([You must install the pciaccess module to build with udev])
|
||||
fi
|
||||
|
||||
if test "$with_udev" = "yes" ; then
|
||||
PKG_CHECK_EXISTS([libudev >= 218], [with_udev_logging=no], [with_udev_logging=yes])
|
||||
if test "$with_udev_logging" = "yes" ; then
|
||||
AC_DEFINE_UNQUOTED([HAVE_UDEV_LOGGING], 1, [whether libudev logging can be used])
|
||||
fi
|
||||
fi
|
||||
])
|
||||
|
||||
AC_DEFUN([LIBVIRT_RESULT_UDEV],[
|
||||
|
@ -347,7 +347,7 @@ static int udevGenerateDeviceName(struct udev_device *device,
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
#if HAVE_UDEV_LOGGING
|
||||
typedef void (*udevLogFunctionPtr)(struct udev *udev,
|
||||
int priority,
|
||||
const char *file,
|
||||
@ -380,6 +380,7 @@ udevLogFunction(struct udev *udev ATTRIBUTE_UNUSED,
|
||||
|
||||
VIR_FREE(format);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
static int udevTranslatePCIIds(unsigned int vendor,
|
||||
@ -1711,8 +1712,10 @@ static int nodeStateInitialize(bool privileged ATTRIBUTE_UNUSED,
|
||||
* its return value.
|
||||
*/
|
||||
udev = udev_new();
|
||||
#if HAVE_UDEV_LOGGING
|
||||
/* cast to get rid of missing-format-attribute warning */
|
||||
udev_set_log_fn(udev, (udevLogFunctionPtr) udevLogFunction);
|
||||
#endif
|
||||
|
||||
priv->udev_monitor = udev_monitor_new_from_netlink(udev, "udev");
|
||||
if (priv->udev_monitor == NULL) {
|
||||
|
Loading…
Reference in New Issue
Block a user