Refactored errno and ifaddrs compatibility

- Moved missing error code definitions to util.c where they are used.
- Refactored ENAVAIL usage in nvme.c to use a custom, local error code definition, since it was being used as an internal flag anyway.
- Removed ifaddrs struct (not needed).
- Cleaned up build warnings in ocp-nvme.c

Author: bgoing-micron-oss

libnvme/src/nvme/util.c

@@ -9,8 +9,10 @@
 
 #include <errno.h>
 #include <fcntl.h>
+#include <malloc.h>
 #include <stdbool.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
@@ -44,6 +46,13 @@
 #define LINE_MAX 2048
 #endif
 
+/* Windows errno.h doesn't define these*/
+#if defined (_WIN32) || defined(_WIN64)
+#define EREMOTEIO 121
+#define EDQUOT    122
+#define ERESTART  85
+#endif
+
 /* Source Code Control System, query version of binary with 'what' */
 const char sccsid[] = "@(#)libnvme " GIT_VERSION;
 

libnvme/src/platform/windows.h

@@ -58,28 +58,6 @@ static inline int random_uuid(unsigned char *uuid, size_t len)
 }
 
 
-/* errno.h compatibility */
-
-#define EREMOTEIO 121	// util.c
-#define EDQUOT    122	// util.c
-#define ERESTART  85	// util.c
-#define ENOTBLK   15	// sfx-nvme.c - could they just use libnvme's check for char device instead?
-#define ENAVAIL   119	// nvme.c - just used internally, define a custom, internal error code for this?
-
-
-/* ifaddrs.h compatibility */
-
-struct ifaddrs {
-	struct ifaddrs *ifa_next;
-	char *ifa_name;
-	unsigned int ifa_flags;
-	struct sockaddr *ifa_addr;
-	struct sockaddr *ifa_netmask;
-	struct sockaddr *ifa_broadaddr;
-	void *ifa_data;
-};
-
-
 /* time.h POSIX compatibility */
 
 static inline struct tm *gmtime_r(const time_t *timep, struct tm *result)

nvme.c

@@ -7353,6 +7353,9 @@ static void get_pif_sts(struct nvme_id_ns *ns, struct nvme_nvm_id_ns *nvm_ns,
 		*pif = (elbaf & NVME_NVM_ELBAF_QPIF_MASK) >> 9;
 }
 
+
+#define ERR_IGNORE_INVALID_FIELD 0x2000 /* invalid field error - ignore */
+
 static int get_pi_info(struct libnvme_transport_handle *hdl,
 		__u32 nsid, __u8 prinfo, __u64 ilbrt, __u64 lbst,
 		unsigned int *logical_block_size, __u16 *metadata_size)
@@ -7394,7 +7397,7 @@ static int get_pi_info(struct libnvme_transport_handle *hdl,
 		 * Keep the I/O commands behavior same as before.
 		 * Since the error returned by drives unsupported.
 		 */
-		return -ENAVAIL;
+		return ERR_IGNORE_INVALID_FIELD;
 
 	pi_size = (pif == NVME_NVM_PIF_16B_GUARD) ? 8 : 16;
 	if (NVME_FLBAS_META_EXT(ns->flbas)) {
@@ -7449,7 +7452,7 @@ static int init_pi_tags(struct libnvme_transport_handle *hdl,
 		 * Keep the I/O commands behavior same as before.
 		 * Since the error returned by drives unsupported.
 		 */
-		return -ENAVAIL;
+		return ERR_IGNORE_INVALID_FIELD;
 
 	if (invalid_tags(lbst, ilbrt, sts, pif))
 		return -EINVAL;
@@ -7565,7 +7568,7 @@ static int write_zeroes(int argc, char **argv,
 
 	err = init_pi_tags(hdl, &cmd, cfg.nsid, cfg.ilbrt, cfg.lbst, cfg.lbat,
 			   cfg.lbatm);
-	if (err && err != -ENAVAIL)
+	if (err && err != ERR_IGNORE_INVALID_FIELD)
 		return err;
 
 	err = libnvme_submit_io_passthru(hdl, &cmd);
@@ -7908,7 +7911,7 @@ static int copy_cmd(int argc, char **argv, struct command *acmd, struct plugin *
 		       cfg.fua, cfg.lr, 0, cfg.dspec, copy->f0);
 	err = init_pi_tags(hdl, &cmd, cfg.nsid, cfg.ilbrt, cfg.lbst, cfg.lbat,
 		cfg.lbatm);
-	if (err != 0 && err != -ENAVAIL)
+	if (err != 0 && err != ERR_IGNORE_INVALID_FIELD)
 		return err;
 	err = libnvme_submit_io_passthru(hdl, &cmd);
 	if (err) {
@@ -8747,7 +8750,7 @@ static int verify_cmd(int argc, char **argv, struct command *acmd, struct plugin
 		cfg.block_count, control, 0, NULL, 0, NULL, 0);
 	err = init_pi_tags(hdl, &cmd, cfg.nsid, cfg.ilbrt, cfg.lbst,
 		cfg.lbat, cfg.lbatm);
-	if (err != 0 && err != -ENAVAIL)
+	if (err != 0 && err != ERR_IGNORE_INVALID_FIELD)
 		return err;
 	err = libnvme_submit_io_passthru(hdl, &cmd);
 	if (err) {

plugins/ocp/ocp-nvme.c

@@ -292,7 +292,6 @@ int ocp_set_latency_monitor_feature(int argc, char **argv, struct command *acmd,
 	__u64 result;
 	struct feature_latency_monitor buf = { 0 };
 	__u32  nsid = NVME_NSID_ALL;
-	struct stat nvme_stat;
 	struct nvme_id_ctrl ctrl;
 
 	const char *desc = "Set Latency Monitor feature.";
@@ -1433,7 +1432,6 @@ static int ocp_telemetry_log(int argc, char **argv, struct command *acmd, struct
 	__cleanup_nvme_transport_handle struct libnvme_transport_handle *hdl = NULL;
 	int err = 0;
 	__u32  nsid = NVME_NSID_ALL;
-	struct stat nvme_stat;
 	char sn[21] = {0,};
 	struct nvme_id_ctrl ctrl;
 	bool is_support_telemetry_controller;