From: Michal Privoznik <mprivozn@redhat.com>
Date: Fri, 17 May 2019 09:01:49 +0000 (+0200)
Subject: lib: Drop UDEVSETTLE
X-Git-Tag: v5.4.0-rc1~62
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2944dcb2de014a881c3539a43f989c2a723e87ca;p=thirdparty%2Flibvirt.git

lib: Drop UDEVSETTLE

The udevsettle binary is no longer used anywhere as it was
replaced by 'udevadm settle'. There's no reason for us to even
check for it in configure.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/m4/virt-external-programs.m4 b/m4/virt-external-programs.m4
index ab6149288f..3c915e1a65 100644
--- a/m4/virt-external-programs.m4
+++ b/m4/virt-external-programs.m4
@@ -46,7 +46,6 @@ AC_DEFUN([LIBVIRT_CHECK_EXTERNAL_PROGRAMS], [
   AC_PATH_PROG([RADVD], [radvd], [radvd], [$LIBVIRT_SBIN_PATH])
   AC_PATH_PROG([TC], [tc], [tc], [$LIBVIRT_SBIN_PATH])
   AC_PATH_PROG([UDEVADM], [udevadm], [], [$LIBVIRT_SBIN_PATH])
-  AC_PATH_PROG([UDEVSETTLE], [udevsettle], [], [$LIBVIRT_SBIN_PATH])
   AC_PATH_PROG([MODPROBE], [modprobe], [modprobe], [$LIBVIRT_SBIN_PATH])
   AC_PATH_PROG([RMMOD], [rmmod], [rmmod], [$LIBVIRT_SBIN_PATH])
   AC_PATH_PROG([MMCTL], [mm-ctl], [mm-ctl], [$LIBVIRT_SBIN_PATH])
@@ -71,10 +70,6 @@ AC_DEFUN([LIBVIRT_CHECK_EXTERNAL_PROGRAMS], [
     AC_DEFINE_UNQUOTED([UDEVADM], ["$UDEVADM"],
                        [Location or name of the udevadm program])
   fi
-  if test -n "$UDEVSETTLE"; then
-    AC_DEFINE_UNQUOTED([UDEVSETTLE], ["$UDEVSETTLE"],
-                       [Location or name of the udevsettle program])
-  fi
   if test -n "$MODPROBE"; then
     AC_DEFINE_UNQUOTED([MODPROBE], ["$MODPROBE"],
                        [Location or name of the modprobe program])
diff --git a/src/util/virutil.c b/src/util/virutil.c
index 6123741756..ecef24d2f3 100644
--- a/src/util/virutil.c
+++ b/src/util/virutil.c
@@ -1479,14 +1479,10 @@ virSetUIDGIDWithCaps(uid_t uid, gid_t gid, gid_t *groups, int ngroups,
 #endif
 
 
-#if defined(UDEVADM) || defined(UDEVSETTLE)
+#if defined(UDEVADM)
 void virWaitForDevices(void)
 {
-# ifdef UDEVADM
     const char *const settleprog[] = { UDEVADM, "settle", NULL };
-# else
-    const char *const settleprog[] = { UDEVSETTLE, NULL };
-# endif
     int exitstatus;
 
     if (access(settleprog[0], X_OK) != 0)