nbft: Moves public nbft methods from libnvme to libnvmf

bgoing-micron-oss · bgoing-micron-oss · commit 27bd067ae8e3 · 2026-04-28T08:50:55.000-07:00
Fixes check-public-headers test with fabrics disabed.  Since nbft is
not included when fabrics is disabled, moves public nbft methods from
libnvme.ld to libnvmf.ld and renames them with the libnvmf prefix.

Also fixes build warnings in private.h when building with fabrics
disables but netdb available.  Includes ifaddrs in private.h if needed.

Signed-off-by: Broc Going &lt;bgoing@micron.com&gt;
diff --git a/libnvme/doc/man/libnvmf_free_nbft.2 b/libnvme/doc/man/libnvmf_free_nbft.2
@@ -1,8 +1,8 @@
-.TH "libnvme_free_nbft" 9 "libnvme_free_nbft" "April 2026" "libnvme API manual" LINUX
+.TH "libnvmf_free_nbft" 9 "libnvmf_free_nbft" "April 2026" "libnvme API manual" LINUX
 .SH NAME
-libnvme_free_nbft \- Free the struct libnbft_info and its contents
+libnvmf_free_nbft \- Free the struct libnbft_info and its contents
 .SH SYNOPSIS
-.B "void" libnvme_free_nbft
+.B "void" libnvmf_free_nbft
 .BI "(struct libnvme_global_ctx *ctx "  ","
 .BI "struct libnbft_info *nbft "  ");"
 .SH ARGUMENTS
diff --git a/libnvme/doc/man/libnvmf_read_nbft.2 b/libnvme/doc/man/libnvmf_read_nbft.2
@@ -1,8 +1,8 @@
-.TH "libnvme_read_nbft" 9 "libnvme_read_nbft" "April 2026" "libnvme API manual" LINUX
+.TH "libnvmf_read_nbft" 9 "libnvmf_read_nbft" "April 2026" "libnvme API manual" LINUX
 .SH NAME
-libnvme_read_nbft \- Read and parse contents of an ACPI NBFT table
+libnvmf_read_nbft \- Read and parse contents of an ACPI NBFT table
 .SH SYNOPSIS
-.B "int" libnvme_read_nbft
+.B "int" libnvmf_read_nbft
 .BI "(struct libnvme_global_ctx *ctx "  ","
 .BI "struct libnbft_info **nbft "  ","
 .BI "const char *filename "  ");"
diff --git a/libnvme/doc/rst/nbft.rst b/libnvme/doc/rst/nbft.rst
@@ -431,7 +431,7 @@
 
 
 
-.. c:function:: int libnvme_read_nbft (struct libnvme_global_ctx *ctx, struct libnbft_info **nbft, const char *filename)
+.. c:function:: int libnvmf_read_nbft (struct libnvme_global_ctx *ctx, struct libnbft_info **nbft, const char *filename)
 
    Read and parse contents of an ACPI NBFT table
 
@@ -449,14 +449,14 @@
 **Description**
 
 Read and parse the specified NBFT file into a struct libnbft_info.
-Free with libnvme_free_nbft().
+Free with libnvmf_free_nbft().
 
 **Return**
 
 0 on success, errno otherwise.
 
 
-.. c:function:: void libnvme_free_nbft (struct libnvme_global_ctx *ctx, struct libnbft_info *nbft)
+.. c:function:: void libnvmf_free_nbft (struct libnvme_global_ctx *ctx, struct libnbft_info *nbft)
 
    Free the struct libnbft_info and its contents
 
diff --git a/libnvme/libnvme/nvme.i b/libnvme/libnvme/nvme.i
@@ -1368,13 +1368,13 @@ struct libnvme_ns {
 		PyObject *output;
 		int ret;
 
-		ret = libnvme_read_nbft(ctx, &nbft, filename);
+		ret = libnvmf_read_nbft(ctx, &nbft, filename);
 		if (ret) {
 			Py_RETURN_NONE;
 		}
 
 		output = nbft_to_pydict(nbft);
-		libnvme_free_nbft(ctx, nbft);
+		libnvmf_free_nbft(ctx, nbft);
 		return output;
 	}
 %};
diff --git a/libnvme/src/libnvme.ld b/libnvme/src/libnvme.ld
@@ -38,7 +38,6 @@ LIBNVME_3 {
 		libnvme_free_ctrl;
 		libnvme_free_global_ctx;
 		libnvme_free_host;
-		libnvme_free_nbft;
 		libnvme_free_ns;
 		libnvme_free_subsystem;
 		libnvme_gen_dhchap_key;
@@ -178,7 +177,6 @@ LIBNVME_3 {
 		libnvme_read_hostid;
 		libnvme_read_hostnqn;
 		libnvme_read_key;
-		libnvme_read_nbft;
 		libnvme_refresh_topology;
 		libnvme_rescan_ctrl;
 		libnvme_rescan_ns;
diff --git a/libnvme/src/libnvmf.ld b/libnvme/src/libnvmf.ld
@@ -29,13 +29,15 @@ LIBNVMF_3 {
 		libnvmf_discovery_nbft;
 		libnvmf_eflags_str;
 		libnvmf_exat_ptr_next;
+		libnvmf_free_nbft;
 		libnvmf_get_default_trsvcid;
 		libnvmf_get_discovery_log;
 		libnvmf_is_registration_supported;
 		libnvmf_nbft_free;
 		libnvmf_nbft_read_files;
 		libnvmf_prtype_str;
 		libnvmf_qptype_str;
+		libnvmf_read_nbft;
 		libnvmf_register_ctrl;
 		libnvmf_sectype_str;
 		libnvmf_subtype_str;
diff --git a/libnvme/src/nvme/fabrics.c b/libnvme/src/nvme/fabrics.c
@@ -2600,7 +2600,7 @@ __public int libnvmf_nbft_read_files(struct libnvme_global_ctx *ctx, char *path,
 		snprintf(filename, sizeof(filename), "%s/%s", path,
 			dent[i]->d_name);
 
-		ret = libnvme_read_nbft(ctx, &nbft, filename);
+		ret = libnvmf_read_nbft(ctx, &nbft, filename);
 		if (!ret) {
 			struct nbft_file_entry *new;
 
@@ -2630,7 +2630,7 @@ __public void libnvmf_nbft_free(struct libnvme_global_ctx *ctx, struct nbft_file
 	while (head) {
 		struct nbft_file_entry *next = head->next;
 
-		libnvme_free_nbft(ctx, head->nbft);
+		libnvmf_free_nbft(ctx, head->nbft);
 		free(head);
 
 		head = next;
diff --git a/libnvme/src/nvme/nbft.c b/libnvme/src/nvme/nbft.c
@@ -710,7 +710,7 @@ static int parse_raw_nbft(struct libnvme_global_ctx *ctx, struct libnbft_info *n
 	return 0;
 }
 
-__public void libnvme_free_nbft(struct libnvme_global_ctx *ctx, struct libnbft_info *nbft)
+__public void libnvmf_free_nbft(struct libnvme_global_ctx *ctx, struct libnbft_info *nbft)
 {
 	struct libnbft_hfi **hfi;
 	struct libnbft_security **sec;
@@ -736,7 +736,7 @@ __public void libnvme_free_nbft(struct libnvme_global_ctx *ctx, struct libnbft_i
 	free(nbft);
 }
 
-__public int libnvme_read_nbft(struct libnvme_global_ctx *ctx, struct libnbft_info **nbft,
+__public int libnvmf_read_nbft(struct libnvme_global_ctx *ctx, struct libnbft_info **nbft,
 		const char *filename)
 {
 	__u8 *raw_nbft = NULL;
@@ -800,7 +800,7 @@ __public int libnvme_read_nbft(struct libnvme_global_ctx *ctx, struct libnbft_in
 
 	if (parse_raw_nbft(ctx, *nbft)) {
 		libnvme_msg(ctx, LIBNVME_LOG_ERR, "Failed to parse %s\n", filename);
-		libnvme_free_nbft(ctx, *nbft);
+		libnvmf_free_nbft(ctx, *nbft);
 		return -EINVAL;
 	}
 	return 0;
diff --git a/libnvme/src/nvme/nbft.h b/libnvme/src/nvme/nbft.h
@@ -246,26 +246,26 @@ struct libnbft_info {
 };
 
 /**
- * libnvme_read_nbft() - Read and parse contents of an ACPI NBFT table
+ * libnvmf_read_nbft() - Read and parse contents of an ACPI NBFT table
  *
  * @ctx:      struct libnvme_global_ctx object
  * @nbft:     Parsed NBFT table data.
  * @filename: Filename of the raw NBFT table to read.
  *
  * Read and parse the specified NBFT file into a struct libnbft_info.
- * Free with libnvme_free_nbft().
+ * Free with libnvmf_free_nbft().
  *
  * Return: 0 on success, errno otherwise.
  */
-int libnvme_read_nbft(struct libnvme_global_ctx *ctx, struct libnbft_info **nbft,
+int libnvmf_read_nbft(struct libnvme_global_ctx *ctx, struct libnbft_info **nbft,
 		const char *filename);
 
 /**
- * libnvme_free_nbft() - Free the struct libnbft_info and its contents
+ * libnvmf_free_nbft() - Free the struct libnbft_info and its contents
  * @ctx: struct libnvme_global_ctx object
  * @nbft: Parsed NBFT table data.
  */
-void libnvme_free_nbft(struct libnvme_global_ctx *ctx, struct libnbft_info *nbft);
+void libnvmf_free_nbft(struct libnvme_global_ctx *ctx, struct libnbft_info *nbft);
 
 /**
  * struct nbft_file_entry - Linked list entry for NBFT files
diff --git a/libnvme/src/nvme/private.h b/libnvme/src/nvme/private.h
@@ -10,6 +10,10 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
+#if defined(HAVE_NETDB) || defined(CONFIG_FABRICS)
+#include <ifaddrs.h>
+#endif
+
 #include <ccan/list/list.h>
 
 #include "nvme/nvme-types.h"
diff --git a/libnvme/test/nbft/nbft-dump.c b/libnvme/test/nbft/nbft-dump.c
@@ -118,7 +118,7 @@ int main(int argc, char **argv)
 		return 1;
 	}
 
-	if (libnvme_read_nbft(ctx, &table, argv[1]) != 0) {
+	if (libnvmf_read_nbft(ctx, &table, argv[1]) != 0) {
 		fprintf(stderr, "Error parsing the NBFT table %s: %m\n",
 			argv[1]);
 		libnvme_free_global_ctx(ctx);
@@ -127,7 +127,7 @@ int main(int argc, char **argv)
 
 	print_nbft(table);
 
-	libnvme_free_nbft(ctx, table);
+	libnvmf_free_nbft(ctx, table);
 	libnvme_free_global_ctx(ctx);
 	return 0;
 }

Original file line number	Diff line number	Diff line change
`@@ -1368,13 +1368,13 @@ struct libnvme_ns {`
`1368`	`1368`	`PyObject *output;`
`1369`	`1369`	`int ret;`
`1370`	`1370`
`1371`		`- ret = libnvme_read_nbft(ctx, &nbft, filename);`
	`1371`	`+ ret = libnvmf_read_nbft(ctx, &nbft, filename);`
`1372`	`1372`	`if (ret) {`
`1373`	`1373`	`Py_RETURN_NONE;`
`1374`	`1374`	`}`
`1375`	`1375`
`1376`	`1376`	`output = nbft_to_pydict(nbft);`
`1377`		`- libnvme_free_nbft(ctx, nbft);`
	`1377`	`+ libnvmf_free_nbft(ctx, nbft);`
`1378`	`1378`	`return output;`
`1379`	`1379`	`}`
`1380`	`1380`	`%};`
Original file line number	Diff line number	Diff line change
`@@ -710,7 +710,7 @@ static int parse_raw_nbft(struct libnvme_global_ctx ctx, struct libnbft_info n`
`710`	`710`	`return 0;`
`711`	`711`	`}`
`712`	`712`
`713`		`-__public void libnvme_free_nbft(struct libnvme_global_ctx ctx, struct libnbft_info nbft)`
	`713`	`+__public void libnvmf_free_nbft(struct libnvme_global_ctx ctx, struct libnbft_info nbft)`
`714`	`714`	`{`
`715`	`715`	`struct libnbft_hfi **hfi;`
`716`	`716`	`struct libnbft_security **sec;`
`@@ -736,7 +736,7 @@ __public void libnvme_free_nbft(struct libnvme_global_ctx *ctx, struct libnbft_i`
`736`	`736`	`free(nbft);`
`737`	`737`	`}`
`738`	`738`
`739`		`-__public int libnvme_read_nbft(struct libnvme_global_ctx ctx, struct libnbft_info *nbft,`
	`739`	`+__public int libnvmf_read_nbft(struct libnvme_global_ctx ctx, struct libnbft_info *nbft,`
`740`	`740`	`const char *filename)`
`741`	`741`	`{`
`742`	`742`	`__u8 *raw_nbft = NULL;`
`@@ -800,7 +800,7 @@ __public int libnvme_read_nbft(struct libnvme_global_ctx *ctx, struct libnbft_in`
`800`	`800`
`801`	`801`	`if (parse_raw_nbft(ctx, *nbft)) {`
`802`	`802`	`libnvme_msg(ctx, LIBNVME_LOG_ERR, "Failed to parse %s\n", filename);`
`803`		`- libnvme_free_nbft(ctx, *nbft);`
	`803`	`+ libnvmf_free_nbft(ctx, *nbft);`
`804`	`804`	`return -EINVAL;`
`805`	`805`	`}`
`806`	`806`	`return 0;`