log: remove deprecated default global context functions

The global context has been introduced throughout the library thus we
don't need the fallback default global context anymore.

Signed-off-by: Daniel Wagner <wagi@kernel.org>

Author: igaw

libnvme/src/libnvme.ld

@@ -81,12 +81,10 @@ LIBNVME_2_0 {
 		nvme_get_attr;
 		nvme_get_ctrl_attr;
 		nvme_get_ctrl_telemetry;
-		nvme_get_debug;
 		nvme_get_directive_receive_length;
 		nvme_get_feature_length;
 		nvme_get_host_telemetry;
 		nvme_get_log;
-		nvme_get_logging_level;
 		nvme_get_logical_block_size;
 		nvme_get_new_host_telemetry;
 		nvme_get_ns_attr;
@@ -118,7 +116,6 @@ LIBNVME_2_0 {
 		nvme_init_copy_range_f3;
 		nvme_init_ctrl;
 		nvme_init_ctrl_list;
-		nvme_init_default_logging;
 		nvme_init_dsm_range;
 		nvme_init_logging;
 		nvme_insert_tls_key;
@@ -230,7 +227,6 @@ LIBNVME_2_0 {
 		nvme_scan_tls_keys;
 		nvme_scan_topology;
 		nvme_set_application;
-		nvme_set_debug;
 		nvme_set_dry_run;
 		nvme_set_etdas;
 		nvme_set_keyring;

libnvme/src/nvme/log.c

@@ -10,13 +10,11 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <stdarg.h>
 #include <stdbool.h>
 #include <syslog.h>
 #include <unistd.h>
 #include <time.h>
-#include <string.h>
 #define LOG_FUNCNAME 1
 #include "private.h"
 #include "log.h"
@@ -26,18 +24,11 @@
 #define LOG_CLOCK CLOCK_MONOTONIC
 #endif
 
-static struct nvme_log def_log = {
-	.fd = STDERR_FILENO,
-	.level = DEFAULT_LOGLEVEL,
-	.pid = false,
-	.timestamp = false,
-};
-
 void __attribute__((format(printf, 4, 5)))
 __nvme_msg(struct nvme_global_ctx *ctx, int level,
 	   const char *func, const char *format, ...)
 {
-	struct nvme_log *l;
+	struct nvme_log *l = &ctx->log;
 	va_list ap;
 	char pidbuf[16];
 	char timebuf[32];
@@ -55,11 +46,6 @@ __nvme_msg(struct nvme_global_ctx *ctx, int level,
 	_cleanup_free_ char *message = NULL;
 	int idx = 0;
 
-	if (ctx)
-		l = &ctx->log;
-	else
-		l = &def_log;
-
 	if (level > l->level)
 		return;
 
@@ -96,51 +82,20 @@ __nvme_msg(struct nvme_global_ctx *ctx, int level,
 		message ? message : "<error>");
 }
 
-void nvme_init_logging(struct nvme_global_ctx *ctx, int lvl, bool log_pid, bool log_tstamp)
+void nvme_init_logging(struct nvme_global_ctx *ctx, int lvl,
+		bool log_pid, bool log_tstamp)
 {
 	ctx->log.level = lvl;
 	ctx->log.pid = log_pid;
 	ctx->log.timestamp = log_tstamp;
 }
 
-int nvme_get_logging_level(struct nvme_global_ctx *ctx, bool *log_pid, bool *log_tstamp)
+int nvme_get_logging_level(struct nvme_global_ctx *ctx,
+		bool *log_pid, bool *log_tstamp)
 {
-	struct nvme_log *l;
-
-	if (ctx)
-		l = &ctx->log;
-	else
-		l = &def_log;
-
 	if (log_pid)
-		*log_pid = l->pid;
+		*log_pid = ctx->log.pid;
 	if (log_tstamp)
-		*log_tstamp = l->timestamp;
-	return l->level;
-}
-
-void nvme_init_default_logging(FILE *fp, int level, bool log_pid, bool log_tstamp)
-{
-	def_log.fd = fileno(fp);
-	def_log.level = level;
-	def_log.pid = log_pid;
-	def_log.timestamp = log_tstamp;
-}
-
-void nvme_set_global_ctx(struct nvme_global_ctx *ctx)
-{
-	def_log.fd = ctx->log.fd;
-	def_log.level = ctx->log.level;
-	def_log.pid = ctx->log.pid;
-	def_log.timestamp = ctx->log.timestamp;
-}
-
-void nvme_set_debug(bool debug)
-{
-	def_log.level = debug ? LOG_DEBUG : DEFAULT_LOGLEVEL;
-}
-
-bool nvme_get_debug(void)
-{
-	return def_log.level == LOG_DEBUG;
+		*log_tstamp = ctx->log.timestamp;
+	return ctx->log.level;
 }

libnvme/src/nvme/log.h

@@ -33,7 +33,8 @@
  *
  * Sets the default logging variables for the library.
  */
-void nvme_init_logging(struct nvme_global_ctx *ctx, int lvl, bool log_pid, bool log_tstamp);
+void nvme_init_logging(struct nvme_global_ctx *ctx, int lvl,
+		bool log_pid, bool log_tstamp);
 
 /**
  * nvme_init_default_logging() - Initialize default (fallback) logging
@@ -45,7 +46,8 @@ void nvme_init_logging(struct nvme_global_ctx *ctx, int lvl, bool log_pid, bool
  * Sets the default logging settings for the library in case the root object
  * is absent.
  */
-void nvme_init_default_logging(FILE *fp, int lvl, bool log_pid, bool log_tstamp);
+void nvme_init_default_logging(FILE *fp, int lvl, bool log_pid,
+		bool log_tstamp);
 
 /**
  * nvme_get_logging_level() - Get current logging level
@@ -59,40 +61,7 @@ void nvme_init_default_logging(FILE *fp, int lvl, bool log_pid, bool log_tstamp)
  *
  * Return: current log level value or DEFAULT_LOGLEVEL if not initialized.
  */
-int nvme_get_logging_level(struct nvme_global_ctx *ctx, bool *log_pid, bool *log_tstamp);
-
-/**
- * nvme_set_global_ctx() - Set global context
- * @ctx:		struct nvme_global_ctx object
- *
- * In order to be able to log from code paths where no global context
- * object is passed in via the arguments use the the default one which
- * can be set via this call. When creating a new global context object
- * with @nvme_create_global_ctx the global context object will be set as
- * well. This means the global context object is always pointing to the
- * latest created global context object. Note the first
- * @nvme_free_global_ctx call will reset the global context object.
- *
- * This function is deprecated. Use nvme_init_default_logging or/and
- * nvme_init_logging instead.
- */
-void nvme_set_global_ctx(struct nvme_global_ctx *ctx) __attribute__((deprecated));
-
-/**
- * nvme_set_debug - Set NVMe command debugging output
- * @debug:	true to enable or false to disable
- *
- * This function is deprecated. Use nvme_init_default_logging instead.
- */
-void nvme_set_debug(bool debug) __attribute__((deprecated));
-
-/**
- * nvme_get_debug - Get NVMe command debugging output
- *
- * This function is deprecated. Use nvme_get_logging_level instead.
- *
- * Return: false if disabled or true if enabled.
- */
-bool nvme_get_debug(void) __attribute__((deprecated));
+int nvme_get_logging_level(struct nvme_global_ctx *ctx, bool *log_pid,
+		bool *log_tstamp);
 
 #endif /* _LOG_H */

nvme.c

@@ -372,7 +372,6 @@ static int parse_args(int argc, char *argv[], const char *desc,
 		return ret;
 
 	log_level = map_log_level(nvme_cfg.verbose, false);
-	nvme_init_default_logging(stderr, log_level, false, false);
 
 	return 0;
 }

plugins/nbft/nbft-plugin.c

@@ -559,7 +559,6 @@ int show_nbft(int argc, char **argv, struct command *acmd, struct plugin *plugin
 		return ret;
 
 	log_level = map_log_level(verbose, false /* quiet */);
-	nvme_init_default_logging(stderr, log_level, false, false);
 
 	ret = validate_output_format(format, &flags);
 	if (ret < 0)