libvnme: Remove __nvme_msg from export map

nvme-cli was using the library infrastructure for logging. In the
meantime this has been removed, hence we can remove this function from
the export map.

Furthermore, move nvme_msg() and __nvme_msg() to private header.

Signed-off-by: Daniel Wagner <dwagner@suse.de>

diff --git a/src/libnvme.map b/src/libnvme.map
index eac4610861ab243a420e169f4d54a33f9a02d769..9bcc84534edcf4250f7d301b23f9c68a095a0c52 100644 (file)
--- a/src/libnvme.map
+++ b/src/libnvme.map
@@ -1,6 +1,5 @@
 LIBNVME_1_0 {
        global:
-               __nvme_msg;
                nvme_admin_passthru64;
                nvme_admin_passthru;
                nvme_attach_ns;

diff --git a/src/nvme/json.c b/src/nvme/json.c
index 49468c8acc197786bbc352620efb9956fd959675..ebc1ae4f991e02772707d1c45f51413a1e622922 100644 (file)
--- a/src/nvme/json.c
+++ b/src/nvme/json.c
@@ -14,6 +14,7 @@
 
 #include "fabrics.h"
 #include "log.h"
+#include "private.h"
 
 #define json_object_add_value_string(o, k, v)                  \
        json_object_object_add(o, k, json_object_new_string(v))

diff --git a/src/nvme/log.h b/src/nvme/log.h
index 8a0d2e3a3ca866144da10a682f053eb9ebae6563..eea652d6879f0d7371663fdfb783cd2a738edb70 100644 (file)
--- a/src/nvme/log.h
+++ b/src/nvme/log.h
@@ -15,22 +15,6 @@
 #  define DEFAULT_LOGLEVEL LOG_NOTICE
 #endif
 
-#if (LOG_FUNCNAME == 1)
-#define __nvme_log_func __func__
-#else
-#define __nvme_log_func NULL
-#endif
-
-void __attribute__((format(printf, 4, 5)))
-__nvme_msg(nvme_root_t r, int lvl, const char *func, const char *format, ...);
-
-#define nvme_msg(r, lvl, format, ...)                                  \
-       do {                                                            \
-               if ((lvl) <= MAX_LOGLEVEL)                              \
-                       __nvme_msg(r, lvl, __nvme_log_func,             \
-                                  format, ##__VA_ARGS__);              \
-       } while (0)
-
 /**
  * nvme_init_logging() - initialize logging
  * @r: nvme_root_t context

diff --git a/src/nvme/private.h b/src/nvme/private.h
index f33784bfb7c0bdb705e671f8bc7f1ded097f44e6..945b453a369b6bab09017a8df642134fbc66a85b 100644 (file)
--- a/src/nvme/private.h
+++ b/src/nvme/private.h
@@ -133,4 +133,20 @@ void json_read_config(nvme_root_t r, const char *config_file);
 
 int json_update_config(nvme_root_t r, const char *config_file);
 
+#if (LOG_FUNCNAME == 1)
+#define __nvme_log_func __func__
+#else
+#define __nvme_log_func NULL
+#endif
+
+void __attribute__((format(printf, 4, 5)))
+__nvme_msg(nvme_root_t r, int lvl, const char *func, const char *format, ...);
+
+#define nvme_msg(r, lvl, format, ...)                                  \
+       do {                                                            \
+               if ((lvl) <= MAX_LOGLEVEL)                              \
+                       __nvme_msg(r, lvl, __nvme_log_func,             \
+                                  format, ##__VA_ARGS__);              \
+       } while (0)
+
 #endif /* _LIBNVME_PRIVATE_H */