nvme-cli: update to libnvme v2

Update to use the libnvme v2 API. Unfortunately, it's not possible to do
step by step updates this change is big. Though the resulting diff is
easy to read.

Generally, following things are necessary to get things going:

- replace struct nvme_dev with nvme_link_t
- drop nvme_cli* wrappers
  - remove MI helper functions
- replaced alternative versions of function with latest
- remove libnvme-mi dependency
- parse_and_open opens root and link object
  - use consistently cleanup helpers for root and link object
  - use early returns

Signed-off-by: Daniel Wagner <[email protected]>

Author: igaw

libnvme-wrap.c

@@ -36,38 +36,3 @@ rtype __attribute__((weak)) name(proto)				\
 		return fn(args);				\
 	return defret;						\
 }
-
-FN(nvme_get_version,
-	const char *, PROTO(enum nvme_version type),
-	ARGS(type), "n/a")
-
-VOID_FN(nvme_init_copy_range_f1,
-	PROTO(struct nvme_copy_range_f1 *copy, __u16 *nlbs,
-	      __u64 *slbas, __u64 *eilbrts, __u32 *elbatms,
-	      __u32 *elbats, __u16 nr),
-	ARGS(copy, nlbs, slbas, eilbrts, elbatms, elbats, nr))
-
-VOID_FN(nvme_init_copy_range_f2,
-	PROTO(struct nvme_copy_range_f2 *copy, __u32 *snsids,
-	      __u16 *nlbs, __u64 *slbas, __u16 *sopts, __u32 *eilbrts,
-	      __u32 *elbatms, __u32 *elbats, __u16 nr),
-	ARGS(copy, snsids, nlbs, slbas, sopts, eilbrts, elbatms, elbats, nr))
-
-VOID_FN(nvme_init_copy_range_f3,
-	PROTO(struct nvme_copy_range_f3 *copy, __u32 *snsids,
-	      __u16 *nlbs, __u64 *slbas, __u16 *sopts, __u64 *eilbrts,
-	      __u32 *elbatms, __u32 *elbats, __u16 nr),
-	ARGS(copy, snsids, nlbs, slbas, sopts, eilbrts, elbatms, elbats, nr))
-
-FN(nvme_get_feature_length2,
-	int,
-	PROTO(int fid, __u32 cdw11, enum nvme_data_tfr dir,
-	      __u32 *len),
-	ARGS(fid, cdw11, dir, len),
-	-EEXIST)
-
-FN(nvme_ctrl_is_persistent,
-	bool,
-	PROTO(nvme_ctrl_t c),
-	ARGS(c),
-	false)

logging.c

@@ -107,7 +107,7 @@ static void nvme_log_retry(int errnum)
 	printf("passthru command returned '%s'\n", strerror(errnum));
 }
 
-int nvme_submit_passthru(int fd, unsigned long ioctl_cmd,
+int nvme_submit_passthru(nvme_link_t l, unsigned long ioctl_cmd,
 			 struct nvme_passthru_cmd *cmd, __u32 *result)
 {
 	struct timeval start;
@@ -119,7 +119,7 @@ int nvme_submit_passthru(int fd, unsigned long ioctl_cmd,
 
 	if (!nvme_cfg.dry_run) {
 retry:
-		err = ioctl(fd, ioctl_cmd, cmd);
+		err = ioctl(nvme_link_get_fd(l), ioctl_cmd, cmd);
 		if (err && (errno == EAGAIN ||
 			    (errno == EINTR && !nvme_sigint_received))) {
 			nvme_log_retry(errno);
@@ -139,7 +139,7 @@ int nvme_submit_passthru(int fd, unsigned long ioctl_cmd,
 	return err;
 }
 
-int nvme_submit_passthru64(int fd, unsigned long ioctl_cmd,
+int nvme_submit_passthru64(nvme_link_t l, unsigned long ioctl_cmd,
 			   struct nvme_passthru_cmd64 *cmd,
 			   __u64 *result)
 {
@@ -152,7 +152,7 @@ int nvme_submit_passthru64(int fd, unsigned long ioctl_cmd,
 
 	if (!nvme_cfg.dry_run) {
 retry:
-		err = ioctl(fd, ioctl_cmd, cmd);
+		err = ioctl(nvme_link_get_fd(l), ioctl_cmd, cmd);
 		if (err && (errno == EAGAIN ||
 			    (errno == EINTR && !nvme_sigint_received))) {
 			nvme_log_retry(errno);

meson.build

@@ -50,8 +50,6 @@ conf.set('RUNDIR', '"@0@"'.format(rundir))
 # Check for libnvme availability
 libnvme_dep = dependency('libnvme', version: '>=1.13', required: true,
                          fallback : ['libnvme', 'libnvme_dep'])
-libnvme_mi_dep = dependency('libnvme-mi', required: true,
-                         fallback : ['libnvme', 'libnvme_mi_dep'])
 
 # Check for libjson-c availability
 if get_option('json-c').disabled()
@@ -280,7 +278,6 @@ sources = [
   'nvme-print-stdout.c',
   'nvme-print-binary.c',
   'nvme-rpmb.c',
-  'nvme-wrap.c',
   'plugin.c',
   'libnvme-wrap.c',
   'logging.c',
@@ -303,7 +300,7 @@ subdir('Documentation')
 executable(
   'nvme',
   sources,
-  dependencies: [ libnvme_dep, libnvme_mi_dep, json_c_dep ],
+  dependencies: [ libnvme_dep, json_c_dep ],
   link_args: '-ldl',
   include_directories: incdir,
   install: true,