lib: add LIBNVME_ prefix to DEFAULT_LOGLEVEL

igaw · igaw · commit 95d720142f65 · 2026-04-14T17:47:32.000+02:00
Use library prefix to avoid colliding with syslog.h definitions.

Signed-off-by: Daniel Wagner &lt;wagi@kernel.org&gt;
diff --git a/libnvme/examples/discover-loop.c b/libnvme/examples/discover-loop.c
@@ -61,7 +61,7 @@ int main()
 
 	libnvmf_default_config(&cfg);
 
-	ctx = libnvme_create_global_ctx(stdout, DEFAULT_LOGLEVEL);
+	ctx = libnvme_create_global_ctx(stdout, LIBNVME_DEFAULT_LOGLEVEL);
 	if (!ctx)
 		return 1;
 
diff --git a/libnvme/examples/display-columnar.c b/libnvme/examples/display-columnar.c
@@ -25,7 +25,7 @@ int main()
 	libnvme_ns_t n;
 	int err;
 
-	ctx = libnvme_create_global_ctx(stdout, DEFAULT_LOGLEVEL);
+	ctx = libnvme_create_global_ctx(stdout, LIBNVME_DEFAULT_LOGLEVEL);
 	if (!ctx)
 		return 1;
 
diff --git a/libnvme/examples/display-tree.c b/libnvme/examples/display-tree.c
@@ -24,7 +24,7 @@ int main()
 	libnvme_ns_t n, _n;
 	int err;
 
-	ctx = libnvme_create_global_ctx(stdout, DEFAULT_LOGLEVEL);
+	ctx = libnvme_create_global_ctx(stdout, LIBNVME_DEFAULT_LOGLEVEL);
 	if (!ctx)
 		return 1;
 
diff --git a/libnvme/examples/mi-conf.c b/libnvme/examples/mi-conf.c
@@ -157,7 +157,7 @@ int main(int argc, char **argv)
 	if (rc)
 		errx(EXIT_FAILURE, "can't parse MI device string '%s'", devstr);
 
-	ctx = libnvme_create_global_ctx(stderr, DEFAULT_LOGLEVEL);
+	ctx = libnvme_create_global_ctx(stderr, LIBNVME_DEFAULT_LOGLEVEL);
 	if (!ctx)
 		err(EXIT_FAILURE, "can't create global context");
 
diff --git a/libnvme/examples/mi-mctp-ae.c b/libnvme/examples/mi-mctp-ae.c
@@ -110,7 +110,7 @@ int main(int argc, char **argv)
 		return EXIT_FAILURE;
 	}
 
-	ctx = libnvme_create_global_ctx(stderr, DEFAULT_LOGLEVEL);
+	ctx = libnvme_create_global_ctx(stderr, LIBNVME_DEFAULT_LOGLEVEL);
 	if (!ctx)
 		err(EXIT_FAILURE, "can't create NVMe root");
 
diff --git a/libnvme/examples/mi-mctp-csi-test.c b/libnvme/examples/mi-mctp-csi-test.c
@@ -237,7 +237,7 @@ int main(int argc, char **argv)
 		return EXIT_FAILURE;
 	}
 
-	ctx = libnvme_create_global_ctx(stderr, DEFAULT_LOGLEVEL);
+	ctx = libnvme_create_global_ctx(stderr, LIBNVME_DEFAULT_LOGLEVEL);
 	if (!ctx)
 		err(EXIT_FAILURE, "can't create NVMe root");
 
diff --git a/libnvme/examples/mi-mctp.c b/libnvme/examples/mi-mctp.c
@@ -848,7 +848,7 @@ int main(int argc, char **argv)
 		}
 		libnvme_free_global_ctx(ctx);
 	} else {
-		ctx = libnvme_create_global_ctx(stderr, DEFAULT_LOGLEVEL);
+		ctx = libnvme_create_global_ctx(stderr, LIBNVME_DEFAULT_LOGLEVEL);
 		if (!ctx)
 			err(EXIT_FAILURE, "can't create NVMe root");
 
diff --git a/libnvme/examples/telemetry-listen.c b/libnvme/examples/telemetry-listen.c
@@ -139,7 +139,7 @@ int main()
 	libnvme_ctrl_t c;
 	libnvme_host_t h;
 
-	ctx = libnvme_create_global_ctx(stdout, DEFAULT_LOGLEVEL);
+	ctx = libnvme_create_global_ctx(stdout, LIBNVME_DEFAULT_LOGLEVEL);
 	if (!ctx)
 		return 1;
 
diff --git a/libnvme/libnvme/nvme.i b/libnvme/libnvme/nvme.i
@@ -488,7 +488,7 @@ struct libnvme_ns {
 	libnvme_global_ctx(const char *config_file = NULL) {
 		struct libnvme_global_ctx *ctx;
 
-		ctx = libnvme_create_global_ctx(stdout, DEFAULT_LOGLEVEL);
+		ctx = libnvme_create_global_ctx(stdout, LIBNVME_DEFAULT_LOGLEVEL);
 		if (!ctx)
 			return NULL;
 
@@ -507,7 +507,7 @@ struct libnvme_ns {
 		return $self;
 	}
 	void log_level(const char *level) {
-		int log_level = DEFAULT_LOGLEVEL;
+		int log_level = LIBNVME_DEFAULT_LOGLEVEL;
 		if (!strcmp(level, "debug")) log_level = LIBNVME_LOG_DEBUG;
 		else if (!strcmp(level, "info")) log_level = LIBNVME_LOG_INFO;
 		else if (!strcmp(level, "warning")) log_level = LIBNVME_LOG_WARN;
diff --git a/libnvme/src/nvme/lib.h b/libnvme/src/nvme/lib.h
@@ -20,7 +20,7 @@ enum libnvme_log_level {
 	LIBNVME_LOG_DEBUG = 3,
 };
 
-#define DEFAULT_LOGLEVEL LIBNVME_LOG_WARN
+#define LIBNVME_DEFAULT_LOGLEVEL LIBNVME_LOG_WARN
 
 /**
  * libnvme_create_global_ctx() - Initialize global context object
@@ -61,7 +61,7 @@ void libnvme_set_logging_level(struct libnvme_global_ctx *ctx, int log_level,
  *
  * Retrieves current values of logging variables.
  *
- * Return: current log level value or DEFAULT_LOGLEVEL if not initialized.
+ * Return: current log level value or LIBNVME_DEFAULT_LOGLEVEL if not initialized.
  */
 int libnvme_get_logging_level(struct libnvme_global_ctx *ctx, bool *log_pid,
 		bool *log_tstamp);
diff --git a/libnvme/src/nvme/mi-mctp.c b/libnvme/src/nvme/mi-mctp.c
@@ -957,7 +957,7 @@ __public struct libnvme_global_ctx *libnvme_mi_scan_mctp(void)
 	dbus_bool_t drc;
 	DBusError berr;
 
-	ctx = libnvme_create_global_ctx(NULL, DEFAULT_LOGLEVEL);
+	ctx = libnvme_create_global_ctx(NULL, LIBNVME_DEFAULT_LOGLEVEL);
 	if (!ctx) {
 		errno = ENOMEM;
 		return NULL;
diff --git a/libnvme/test/cpp.cc b/libnvme/test/cpp.cc
@@ -20,7 +20,7 @@ int main()
 	libnvme_ns_t n;
 	int err;
 
-	ctx = libnvme_create_global_ctx(stdout, DEFAULT_LOGLEVEL);
+	ctx = libnvme_create_global_ctx(stdout, LIBNVME_DEFAULT_LOGLEVEL);
 	if (!ctx)
 		return 1;
 
diff --git a/libnvme/test/ioctl/ana.c b/libnvme/test/ioctl/ana.c
@@ -629,7 +629,7 @@ static void run_test(const char *test_name, void (*test_fn)(void))
 int main(void)
 {
 	struct libnvme_global_ctx *ctx =
-		libnvme_create_global_ctx(stdout, DEFAULT_LOGLEVEL);
+		libnvme_create_global_ctx(stdout, LIBNVME_DEFAULT_LOGLEVEL);
 
 	set_mock_fd(TEST_FD);
 	check(!libnvme_open(ctx, "NVME_TEST_FD", &test_hdl),
diff --git a/libnvme/test/ioctl/discovery.c b/libnvme/test/ioctl/discovery.c
@@ -439,7 +439,7 @@ static void run_test(struct libnvme_global_ctx *ctx, const char *test_name,
 int main(void)
 {
 	struct libnvme_global_ctx *ctx =
-		libnvme_create_global_ctx(stdout, DEFAULT_LOGLEVEL);
+		libnvme_create_global_ctx(stdout, LIBNVME_DEFAULT_LOGLEVEL);
 
 	set_mock_fd(TEST_FD);
 	check(!libnvme_open(ctx, "NVME_TEST_FD", &test_hdl),
diff --git a/libnvme/test/ioctl/features.c b/libnvme/test/ioctl/features.c
@@ -1623,7 +1623,7 @@ static void run_test(const char *test_name, void (*test_fn)(void))
 int main(void)
 {
 	struct libnvme_global_ctx *ctx =
-		libnvme_create_global_ctx(stdout, DEFAULT_LOGLEVEL);
+		libnvme_create_global_ctx(stdout, LIBNVME_DEFAULT_LOGLEVEL);
 
 	set_mock_fd(TEST_FD);
 	check(!libnvme_open(ctx, "NVME_TEST_FD64", &test_hdl),
diff --git a/libnvme/test/ioctl/identify.c b/libnvme/test/ioctl/identify.c
@@ -645,7 +645,7 @@ static void run_test(const char *test_name, void (*test_fn)(void))
 int main(void)
 {
 	struct libnvme_global_ctx * ctx =
-		libnvme_create_global_ctx(stdout, DEFAULT_LOGLEVEL);
+		libnvme_create_global_ctx(stdout, LIBNVME_DEFAULT_LOGLEVEL);
 
 	set_mock_fd(TEST_FD);
 	check(!libnvme_open(ctx, "NVME_TEST_FD", &test_hdl),
diff --git a/libnvme/test/ioctl/logs.c b/libnvme/test/ioctl/logs.c
@@ -1103,7 +1103,7 @@ static void run_test(const char *test_name, void (*test_fn)(void))
 int main(void)
 {
 	struct libnvme_global_ctx * ctx =
-		libnvme_create_global_ctx(stdout, DEFAULT_LOGLEVEL);
+		libnvme_create_global_ctx(stdout, LIBNVME_DEFAULT_LOGLEVEL);
 
 	set_mock_fd(TEST_FD);
 	check(!libnvme_open(ctx, "NVME_TEST_FD", &test_hdl),
diff --git a/libnvme/test/ioctl/misc.c b/libnvme/test/ioctl/misc.c
@@ -1462,7 +1462,7 @@ static void run_test(const char *test_name, void (*test_fn)(void))
 int main(void)
 {
 	struct libnvme_global_ctx *ctx =
-		libnvme_create_global_ctx(stdout, DEFAULT_LOGLEVEL);
+		libnvme_create_global_ctx(stdout, LIBNVME_DEFAULT_LOGLEVEL);
 
 	set_mock_fd(TEST_FD);
 	check(!libnvme_open(ctx, "NVME_TEST_FD64", &test_hdl),
diff --git a/libnvme/test/ioctl/zns.c b/libnvme/test/ioctl/zns.c
@@ -163,7 +163,7 @@ static void run_test(const char *test_name, void (*test_fn)(void))
 int main(void)
 {
 	struct libnvme_global_ctx *ctx =
-		libnvme_create_global_ctx(stdout, DEFAULT_LOGLEVEL);
+		libnvme_create_global_ctx(stdout, LIBNVME_DEFAULT_LOGLEVEL);
 
 	set_mock_fd(TEST_FD);
 	check(!libnvme_open(ctx, "NVME_TEST_FD", &test_hdl),
diff --git a/libnvme/test/mi-mctp.c b/libnvme/test/mi-mctp.c
@@ -1463,7 +1463,7 @@ int main(void)
 
 	__libnvme_mi_mctp_set_ops(&ops);
 
-	ctx = libnvme_create_global_ctx(fd, DEFAULT_LOGLEVEL);
+	ctx = libnvme_create_global_ctx(fd, LIBNVME_DEFAULT_LOGLEVEL);
 	assert(ctx);
 
 	ep = libnvme_mi_open_mctp(ctx, 0, 0);
diff --git a/libnvme/test/mi.c b/libnvme/test/mi.c
@@ -2132,7 +2132,7 @@ int main(void)
 
 	fd = test_setup_log();
 
-	ctx = libnvme_create_global_ctx(fd, DEFAULT_LOGLEVEL);
+	ctx = libnvme_create_global_ctx(fd, LIBNVME_DEFAULT_LOGLEVEL);
 	assert(ctx);
 
 	ep = libnvme_mi_open_test(ctx);
diff --git a/libnvme/test/psk.c b/libnvme/test/psk.c
@@ -345,7 +345,7 @@ static void identity_test_compat(struct libnvme_global_ctx *ctx,
 int main(void)
 {
 	struct libnvme_global_ctx *ctx =
-		libnvme_create_global_ctx(stdout, DEFAULT_LOGLEVEL);
+		libnvme_create_global_ctx(stdout, LIBNVME_DEFAULT_LOGLEVEL);
 
 	for (int i = 0; i < ARRAY_SIZE(test_data_psk); i++)
 		export_test(ctx, &test_data_psk[i]);
diff --git a/libnvme/test/test.c b/libnvme/test/test.c
@@ -391,7 +391,7 @@ int main(int argc, char **argv)
 	const char *nqn_match = "testnqn";
 
 	printf("Test filter for common loop back target\n");
-	ctx = libnvme_create_global_ctx(stdout, DEFAULT_LOGLEVEL);
+	ctx = libnvme_create_global_ctx(stdout, LIBNVME_DEFAULT_LOGLEVEL);
 	if (!ctx)
 		return 1;
 
diff --git a/libnvme/test/zns.c b/libnvme/test/zns.c
@@ -81,7 +81,7 @@ int main()
 	libnvme_ns_t n;
 	int err;
 
-	ctx = libnvme_create_global_ctx(stdout, DEFAULT_LOGLEVEL);
+	ctx = libnvme_create_global_ctx(stdout, LIBNVME_DEFAULT_LOGLEVEL);
 	if (!ctx)
 		return 1;
 
diff --git a/plugins/huawei/huawei-nvme.c b/plugins/huawei/huawei-nvme.c
@@ -297,7 +297,7 @@ static int huawei_list(int argc, char **argv, struct command *acmd,
 		       struct plugin *plugin)
 {
 	__cleanup_nvme_global_ctx struct libnvme_global_ctx *ctx =
-		libnvme_create_global_ctx(stdout, DEFAULT_LOGLEVEL);
+		libnvme_create_global_ctx(stdout, LIBNVME_DEFAULT_LOGLEVEL);
 	char path[264];
 	struct dirent **devices;
 	struct huawei_list_item *list_items;
diff --git a/plugins/netapp/netapp-nvme.c b/plugins/netapp/netapp-nvme.c
@@ -893,7 +893,7 @@ static int netapp_smdevices(int argc, char **argv, struct command *acmd,
 			    struct plugin *plugin)
 {
 	const char *desc = "Display information about E-Series volumes.";
-	__cleanup_nvme_global_ctx struct libnvme_global_ctx *ctx = libnvme_create_global_ctx(stdout, DEFAULT_LOGLEVEL);
+	__cleanup_nvme_global_ctx struct libnvme_global_ctx *ctx = libnvme_create_global_ctx(stdout, LIBNVME_DEFAULT_LOGLEVEL);
 	struct dirent **devices;
 	int num, i, ret, fmt;
 	struct smdevice_info *smdevices;
@@ -991,7 +991,7 @@ static int netapp_smdevices(int argc, char **argv, struct command *acmd,
 static int netapp_ontapdevices(int argc, char **argv, struct command *acmd,
 		struct plugin *plugin)
 {
-	__cleanup_nvme_global_ctx struct libnvme_global_ctx *ctx = libnvme_create_global_ctx(stdout, DEFAULT_LOGLEVEL);
+	__cleanup_nvme_global_ctx struct libnvme_global_ctx *ctx = libnvme_create_global_ctx(stdout, LIBNVME_DEFAULT_LOGLEVEL);
 	const char *desc = "Display information about ONTAP devices.";
 	struct dirent **devices;
 	int num, i, ret, fmt;
diff --git a/plugins/zns/zns.c b/plugins/zns/zns.c
@@ -106,7 +106,7 @@ static int list(int argc, char **argv, struct command *acmd,
 	};
 	struct table *t = table_init_with_columns(columns, ARRAY_SIZE(columns));
 
-	ctx = libnvme_create_global_ctx(stdout, DEFAULT_LOGLEVEL);
+	ctx = libnvme_create_global_ctx(stdout, LIBNVME_DEFAULT_LOGLEVEL);
 	if (!ctx) {
 		fprintf(stderr, "Failed to create root object\n");
 		return -ENOMEM;

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ int main(int argc, char **argv)`
`110`	`110`	`return EXIT_FAILURE;`
`111`	`111`	`}`
`112`	`112`
`113`		`- ctx = libnvme_create_global_ctx(stderr, DEFAULT_LOGLEVEL);`
	`113`	`+ ctx = libnvme_create_global_ctx(stderr, LIBNVME_DEFAULT_LOGLEVEL);`
`114`	`114`	`if (!ctx)`
`115`	`115`	`err(EXIT_FAILURE, "can't create NVMe root");`
`116`	`116`
Original file line number	Diff line number	Diff line change
`@@ -237,7 +237,7 @@ int main(int argc, char **argv)`
`237`	`237`	`return EXIT_FAILURE;`
`238`	`238`	`}`
`239`	`239`
`240`		`- ctx = libnvme_create_global_ctx(stderr, DEFAULT_LOGLEVEL);`
	`240`	`+ ctx = libnvme_create_global_ctx(stderr, LIBNVME_DEFAULT_LOGLEVEL);`
`241`	`241`	`if (!ctx)`
`242`	`242`	`err(EXIT_FAILURE, "can't create NVMe root");`
`243`	`243`
Original file line number	Diff line number	Diff line change
`@@ -848,7 +848,7 @@ int main(int argc, char **argv)`
`848`	`848`	`}`
`849`	`849`	`libnvme_free_global_ctx(ctx);`
`850`	`850`	`} else {`
`851`		`- ctx = libnvme_create_global_ctx(stderr, DEFAULT_LOGLEVEL);`
	`851`	`+ ctx = libnvme_create_global_ctx(stderr, LIBNVME_DEFAULT_LOGLEVEL);`
`852`	`852`	`if (!ctx)`
`853`	`853`	`err(EXIT_FAILURE, "can't create NVMe root");`
`854`	`854`