util: remove unused virKModConfig method

Using virKModConfig would not simplify any existing code.

Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 42f8d7c222ef4e610658bddccb4b267f530b3ad4..487eea41492b1b90e53f796f448bca41e406123a 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -2402,7 +2402,6 @@ virKeycodeValueTranslate;
 
 
 # util/virkmod.h
-virKModConfig;
 virKModIsBlacklisted;
 virKModLoad;
 virKModUnload;

diff --git a/src/util/virkmod.c b/src/util/virkmod.c
index 982df3d91b0ae7e4108c553cc8f0d2eb5f3bff31..d4e35bdf14ecdb060c263521ba11c360548201cb 100644 (file)
--- a/src/util/virkmod.c
+++ b/src/util/virkmod.c
@@ -58,25 +58,6 @@ doRmmod(const char *module, char **errbuf)
     return 0;
 }
 
-/**
- * virKModConfig:
- *
- * Get the current kernel module configuration
- *
- * Returns NULL on failure or a pointer to the output which
- * must be VIR_FREE()'d by the caller
- */
-char *
-virKModConfig(void)
-{
-    char *outbuf = NULL;
-
-    if (doModprobe("-c", NULL, &outbuf, NULL) < 0)
-        return NULL;
-
-    return outbuf;
-}
-
 
 /**
  * virKModLoad:

diff --git a/src/util/virkmod.h b/src/util/virkmod.h
index 605da74416521c83e81919a8a0e0926467d1132c..3bb161df52849005f9e6a79bfac5bc7c7db1fb1f 100644 (file)
--- a/src/util/virkmod.h
+++ b/src/util/virkmod.h
@@ -23,7 +23,6 @@
 
 #include "internal.h"
 
-char *virKModConfig(void);
 char *virKModLoad(const char *)
     ATTRIBUTE_NONNULL(1);
 char *virKModUnload(const char *)

diff --git a/tests/virkmodtest.c b/tests/virkmodtest.c
index 2906ad992ebf1852d7d4588d819e63e4ecb2fadd..3ba8c542d1a429b54cae82e52ab82ad9e2e5c154 100644 (file)
--- a/tests/virkmodtest.c
+++ b/tests/virkmodtest.c
@@ -31,33 +31,6 @@
 
 # define VIR_FROM_THIS VIR_FROM_NONE
 
-static int
-testKModConfig(const void *args G_GNUC_UNUSED)
-{
-    int ret = -1;
-    char *outbuf = NULL;
-
-    /* This will return the contents of a 'modprobe -c' which can differ
-     * from machine to machine - be happy that we get something.
-     */
-    outbuf = virKModConfig();
-    if (!outbuf) {
-        if (virFileIsExecutable(MODPROBE)) {
-            fprintf(stderr, "Failed to get config\n");
-        } else {
-            /* modprobe doesn't exist, do not claim error. */
-            ret = 0;
-        }
-        goto cleanup;
-    }
-    ret = 0;
-
- cleanup:
-    VIR_FREE(outbuf);
-    return ret;
-}
-
-
 static int
 checkOutput(virBufferPtr buf, const char *exp_cmd)
 {
@@ -141,8 +114,6 @@ mymain(void)
 {
     int ret = 0;
 
-    if (virTestRun("config", testKModConfig, NULL) < 0)
-        ret = -1;
     if (virTestRun("load", testKModLoad, NULL) < 0)
         ret = -1;
     if (virTestRun("unload", testKModUnload, NULL) < 0)