Cleaned up remaining MI and Fabrics stubs and compatibility and removed platform/types.h (#96)

Recent upstream changes removed the need for platform/types.h and made
MI and Fabrics only compile if supported, which they aren't on windows.
Cleaning up our Windows support based on these changes.

- Removed platform/types.h
- Removed platform/includes.h support that is no longer needed
  - Removed functionality only used by MI and fabrics
- Removed endian and log support that is not needed due to upstream
refactoring
 - Removed MI and Fabrics stubs
 - Restored nbft.c to match master since it only builds with fabrics

Author: bgoing-micron-oss

libnvme/src/meson.build

@@ -198,7 +198,6 @@ install_headers([
         'platform/includes.h',
         'platform/linux.h',
         'platform/windows.h',
-        'platform/types.h'
     ],
     subdir: 'platform',
     install_mode: mode,

libnvme/src/nvme/nbft.c

@@ -10,7 +10,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <platform/includes.h>
+#include <arpa/inet.h>
 
 #include <ccan/endian/endian.h>
 
@@ -36,7 +36,7 @@ static void format_ip_addr(char *buf, size_t buflen, __u8 *addr)
 	memcpy(&addr_ipv6, addr, sizeof(addr_ipv6));
 	if (IN6_IS_ADDR_V4MAPPED(&addr_ipv6))
 		/* ipv4 */
-		inet_ntop(AF_INET, ipv4_from_in6_addr(addr_ipv6), buf, buflen);
+		inet_ntop(AF_INET, &addr_ipv6.s6_addr32[3], buf, buflen);
 	else
 		/* ipv6 */
 		inet_ntop(AF_INET6, &addr_ipv6, buf, buflen);
@@ -102,9 +102,9 @@ static int __get_heap_obj(struct libnvme_global_ctx *ctx,
 		if (strnlen(*output, le16_to_cpu(obj.length) + 1) <
 				le16_to_cpu(obj.length)) {
 			libnvme_msg(ctx, LIBNVME_LOG_DEBUG,
-				"file %s: string '%s' in descriptor '%s' is shorter (%u) than specified length (%u)\n",
+				"file %s: string '%s' in descriptor '%s' is shorter (%zd) than specified length (%d)\n",
 				filename, fieldname, descriptorname,
-				(unsigned int)strnlen(*output, le16_to_cpu(obj.length) + 1),
+				strnlen(*output, le16_to_cpu(obj.length) + 1),
 					le16_to_cpu(obj.length));
 		} else if (strnlen(*output, le16_to_cpu(obj.length) + 1) >
 				le16_to_cpu(obj.length)) {

libnvme/src/nvme/windows-stubs.c

@@ -4,7 +4,7 @@
  * Copyright (c) 2025 Micron Technology, Inc.
  *
  * Windows stub implementations for Linux-specific functionality
- * that is excluded from the Windows build (fabrics, MI, tree, filters, etc.)
+ * that is excluded from the Windows build (tree, filters, etc.)
  */
 
 #include <errno.h>
@@ -447,14 +447,6 @@ __public libnvme_path_t libnvme_namespace_next_path(libnvme_ns_t ns, libnvme_pat
 	return NULL;
 }
 
-/* MI status string (mi.c) */
-__public const char *libnvme_mi_status_to_string(int status)
-{
-	stub_log(__func__);
-	(void)status;
-	return "MI not supported on Windows";
-}
-
 /*
  * Linux keyring and TLS key management stubs (linux.c)
  * These are used by nvme-cli security commands
@@ -643,7 +635,7 @@ __public int libnvme_create_raw_secret(struct libnvme_global_ctx *ctx,
 	return -ENOTSUP;
 }
 
-/* Hostnqn generation (fabrics.c) */
+/* Hostnqn generation */
 __public char *libnvme_generate_hostnqn(void)
 {
 	stub_log(__func__);
@@ -658,86 +650,3 @@ __public int libnvme_path_get_queue_depth(struct libnvme_path *p)
 	(void)p;
 	return 0;
 }
-
-/* Fabrics string conversion functions (fabrics.c) */
-__public const char *libnvmf_trtype_str(__u8 trtype)
-{
-	stub_log(__func__);
-	(void)trtype;
-	return "unknown";
-}
-
-__public const char *libnvmf_eflags_str(__u16 eflags)
-{
-	stub_log(__func__);
-	(void)eflags;
-	return "unknown";
-}
-
-__public const char *libnvmf_sectype_str(__u8 sectype)
-{
-	stub_log(__func__);
-	(void)sectype;
-	return "unknown";
-}
-
-__public const char *libnvmf_cms_str(__u8 cms)
-{
-	stub_log(__func__);
-	(void)cms;
-	return "unknown";
-}
-
-__public const char *libnvmf_qptype_str(__u8 qptype)
-{
-	stub_log(__func__);
-	(void)qptype;
-	return "unknown";
-}
-
-__public const char *libnvmf_prtype_str(__u8 prtype)
-{
-	stub_log(__func__);
-	(void)prtype;
-	return "unknown";
-}
-
-__public const char *libnvmf_adrfam_str(__u8 adrfam)
-{
-	stub_log(__func__);
-	(void)adrfam;
-	return "unknown";
-}
-
-__public const char *libnvmf_subtype_str(__u8 subtype)
-{
-	stub_log(__func__);
-	(void)subtype;
-	return "unknown";
-}
-
-__public const char *libnvmf_treq_str(__u8 treq)
-{
-	stub_log(__func__);
-	(void)treq;
-	return "unknown";
-}
-
-/* NBFT functions (nbft.c) */
-__public int libnvmf_nbft_read_files(struct libnvme_global_ctx *ctx, char *path,
-			  struct nbft_file_entry **nbft_list)
-{
-	stub_log(__func__);
-	(void)ctx;
-	(void)path;
-	(void)nbft_list;
-	errno = ENOTSUP;
-	return -1;
-}
-
-__public void libnvmf_nbft_free(struct libnvme_global_ctx *ctx, struct nbft_file_entry *head)
-{
-	stub_log(__func__);
-	(void)ctx;
-	(void)head;
-}

libnvme/src/platform/includes.h

@@ -8,8 +8,6 @@
 
 #pragma once
 
-#include "platform/types.h"
-
 /* Platform-specific includes */
 #ifdef _WIN32
     #include "platform/windows.h"

libnvme/src/platform/linux.h

@@ -30,8 +30,6 @@
 #include <netdb.h>
 #include <netinet/in.h>
 
-/* Extract IPv4 from IPv6 mapped address */
-#define ipv4_from_in6_addr(addr) &(addr.s6_addr32[3])
 
 typedef int libnvme_fd_t;
 #define TEST_FD 0xFD

libnvme/src/platform/types.h

@@ -45,52 +45,6 @@ static inline void libnvme_init(void)
 }
 
 
-/* endian.h compatibility */
-
-#if defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-	#define htobe16(x) (x)
-	#define htobe32(x) (x)
-	#define htobe64(x) (x)
-	#define htole16(x) __builtin_bswap16(x)
-	#define htole32(x) __builtin_bswap32(x)
-	#define htole64(x) __builtin_bswap64(x)
-	#define le16toh(x) __builtin_bswap16(x)
-	#define le32toh(x) __builtin_bswap32(x)
-	#define le64toh(x) __builtin_bswap64(x)
-#else
-	/* Little-endian (most common case for Windows) */
-	#define htobe16(x) __builtin_bswap16(x)
-	#define htobe32(x) __builtin_bswap32(x)
-	#define htobe64(x) __builtin_bswap64(x)
-	#define htole16(x) (x)
-	#define htole32(x) (x)
-	#define htole64(x) (x)
-	#define le16toh(x) (x)
-	#define le32toh(x) (x)
-	#define le64toh(x) (x)
-#endif
-
-
-/* syslog.h compatibility */
-
-#define LOG_EMERG   0
-#define LOG_ALERT   1
-#define LOG_CRIT    2
-#define LOG_ERR     3
-#define LOG_WARNING 4
-#define LOG_NOTICE  5
-#define LOG_INFO    6
-#define LOG_DEBUG   7
-static inline void syslog(int priority, const char *format, ...) { (void)priority; (void)format; }
-static inline void openlog(const char *ident, int option, int facility) { (void)ident; (void)option; (void)facility; }
-static inline void closelog(void) { }
-
-
-/* poll.h compatibility (winsock2.h provides additional compatibility) */
-
-typedef unsigned long nfds_t;
-
-
 /* sys/param.h compatibility */
 
 #define MIN(a, b) ((a) < (b) ? (a) : (b))
@@ -106,27 +60,6 @@ typedef unsigned long nfds_t;
 #define ENAVAIL   119
 
 
-/* socket.h compatibility */
-
-struct msghdr {
-	void *msg_name;
-	socklen_t msg_namelen;
-	struct iovec *msg_iov;
-	size_t msg_iovlen;
-	void *msg_control;
-	size_t msg_controllen;
-	int msg_flags;
-};
-
-struct iovec {
-	void *iov_base;
-	size_t iov_len;
-};
-
-/* Extract IPv4 from IPv6 mapped address (in6_addr) */
-#define ipv4_from_in6_addr(addr) &(addr.u.Byte[12])
-
-
 /* ifaddrs.h compatibility */
 
 struct ifaddrs {

libnvme/src/platform/windows.h

@@ -9,55 +9,6 @@
 #ifdef _WIN32
 
 #include <stdio.h>
-#include <stdbool.h>
-
-/* ========== NVMe Fabrics Command Stubs ========== */
-/*
- * NVMe over Fabrics is not currently supported on Windows.
- * These stubs provide error messages when users attempt to use fabrics commands.
- */
-
-int fabrics_discovery(const char *desc, int argc, char **argv, bool connect)
-{
-	(void)desc; (void)argc; (void)argv; (void)connect;
-	fprintf(stderr, "NVMe fabrics discovery is not supported on Windows\n");
-	return -1;
-}
-
-int fabrics_connect(const char *desc, int argc, char **argv)
-{
-	(void)desc; (void)argc; (void)argv;
-	fprintf(stderr, "NVMe fabrics connect is not supported on Windows\n");
-	return -1;
-}
-
-int fabrics_disconnect(const char *desc, int argc, char **argv)
-{
-	(void)desc; (void)argc; (void)argv;
-	fprintf(stderr, "NVMe fabrics disconnect is not supported on Windows\n");
-	return -1;
-}
-
-int fabrics_disconnect_all(const char *desc, int argc, char **argv)
-{
-	(void)desc; (void)argc; (void)argv;
-	fprintf(stderr, "NVMe fabrics disconnect-all is not supported on Windows\n");
-	return -1;
-}
-
-int fabrics_config(const char *desc, int argc, char **argv)
-{
-	(void)desc; (void)argc; (void)argv;
-	fprintf(stderr, "NVMe fabrics config is not supported on Windows\n");
-	return -1;
-}
-
-int fabrics_dim(const char *desc, int argc, char **argv)
-{
-	(void)desc; (void)argc; (void)argv;
-	fprintf(stderr, "NVMe fabrics DIM is not supported on Windows\n");
-	return -1;
-}
 
 /* ========== NVMe RPMB Command Stubs ========== */
 /*