centralize sessiond config option handling
[lttng-tools.git] / src / bin / lttng-sessiond / modprobe.c
index 03545ef41d25b0acf21a5681431daf5d16e99794..75d6387c6fbe6b6c887d2117ee8c62ac6a242199 100644 (file)
@@ -34,6 +34,7 @@
 
 #include "modprobe.h"
 #include "kern-modules.h"
+#include "lttng-sessiond.h"
 
 #define LTTNG_MOD_REQUIRED     1
 #define LTTNG_MOD_OPTIONAL     0
@@ -568,12 +569,7 @@ int modprobe_lttng_data(void)
         * Base probes: either from command line option, environment
         * variable or default list.
         */
-       if (kmod_probes_list) {
-               list = kmod_probes_list;
-       } else {
-               list = utils_get_kmod_probes_list();
-       }
-
+       list = config.kmod_probes_list.value;
        if (list) {
                /* User-specified probes. */
                ret = append_list_to_probes(list);
@@ -608,12 +604,7 @@ int modprobe_lttng_data(void)
        /*
         * Extra modules? Append them to current probes list.
         */
-       if (kmod_extra_probes_list) {
-               list = kmod_extra_probes_list;
-       } else {
-               list = utils_get_extra_kmod_probes_list();
-       }
-
+       list = config.kmod_extra_probes_list.value;
        if (list) {
                ret = append_list_to_probes(list);
                if (ret) {
This page took 0.033341 seconds and 5 git commands to generate.