From: 0xAX <0xAX@users.noreply.github.com>
Date: Fri, 8 Sep 2017 21:51:04 +0000 (+0600)
Subject: kmod-setup: define has_virtio_rng() only in a case when HAVE_KMOD is enabled (#6784)
X-Git-Tag: v235~138
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=95441cf2ed2406c00e3e94f1991992e63c2507c9;p=thirdparty%2Fsystemd.git

kmod-setup: define has_virtio_rng() only in a case when HAVE_KMOD is enabled (#6784)

in other way we will get a warning message:

../src/core/kmod-setup.c:83:13: warning: ‘has_virtio_rng’ defined but
not used [-Wunused-function]

  static bool has_virtio_rng(void) {
             ^~~~~~~~~~~~~~
---

diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c
index 9f69a6d925d..30b42fffe5b 100644
--- a/src/core/kmod-setup.c
+++ b/src/core/kmod-setup.c
@@ -47,7 +47,6 @@ static void systemd_kmod_log(
         log_internalv(LOG_DEBUG, 0, file, line, fn, format, args);
         REENABLE_WARNING;
 }
-#endif
 
 static int has_virtio_rng_nftw_cb(
                 const char *fpath,
@@ -83,6 +82,7 @@ static int has_virtio_rng_nftw_cb(
 static bool has_virtio_rng(void) {
         return (nftw("/sys/devices/pci0000:00", has_virtio_rng_nftw_cb, 64, FTW_MOUNT|FTW_PHYS|FTW_ACTIONRETVAL) == FTW_STOP);
 }
+#endif
 
 int kmod_setup(void) {
 #ifdef HAVE_KMOD