Use argument structure for nvme_dev_self_test()

Use an argument structure instead of passing all arguments one by one.
This allows for a future expansion of the argument list without having
to change the library ABI.

Signed-off-by: Hannes Reinecke <[email protected]>

Author: hreinecke

src/nvme/ioctl.c

@@ -1474,17 +1474,20 @@ int nvme_sanitize_nvm(struct nvme_sanitize_nvm_args *args)
 	return nvme_submit_admin_passthru(args->fd, &cmd, args->result);
 }
 
-int nvme_dev_self_test(int fd, __u32 nsid, enum nvme_dst_stc stc)
+int nvme_dev_self_test(struct nvme_dev_self_test_args *args)
 {
-	__u32 cdw10 = NVME_SET(stc, DEVICE_SELF_TEST_CDW10_STC);
+	__u32 cdw10 = NVME_SET(args->stc, DEVICE_SELF_TEST_CDW10_STC);
 
 	struct nvme_passthru_cmd cmd = {
-		.opcode = nvme_admin_dev_self_test,
-		.nsid = nsid,
-		.cdw10 = cdw10,
+		.opcode		= nvme_admin_dev_self_test,
+		.nsid		= args->nsid,
+		.cdw10		= cdw10,
+		.timeout_ms	= args->timeout,
 	};
 
-	return nvme_submit_admin_passthru(fd, &cmd, NULL);
+	if (args->args_size < sizeof(*args))
+		return -EINVAL;
+	return nvme_submit_admin_passthru(args->fd, &cmd, args->result);
 }
 
 int nvme_virtual_mgmt(int fd, enum nvme_virt_mgmt_act act,

src/nvme/ioctl.h

@@ -3481,10 +3481,25 @@ struct nvme_sanitize_nvm_args {
 int nvme_sanitize_nvm(struct nvme_sanitize_nvm_args *args);
 
 /**
- * nvme_dev_self_test() - Start or abort a self test
+ * nvme_dev_self_test_args - Arguments for the NVMe Device Self Test command
  * @fd:		File descriptor of nvme device
  * @nsid:	Namespace ID to test
  * @stc:	Self test code, see &enum nvme_dst_stc
+ * @timeout:	Timeout in ms
+ * @result:	The command completion result from CQE dword0
+ */
+struct nvme_dev_self_test_args {
+	int args_size;
+	int fd;
+	__u32 nsid;
+	enum nvme_dst_stc stc;
+	__u32 timeout;
+	__u32 *result;
+};
+
+/**
+ * nvme_dev_self_test() - Start or abort a self test
+ * @args:	&struct nvme_dev_self_test argument structure
  *
  * The Device Self-test command starts a device self-test operation or abort a
  * device self-test operation. A device self-test operation is a diagnostic
@@ -3500,7 +3515,7 @@ int nvme_sanitize_nvm(struct nvme_sanitize_nvm_args *args);
  * Return: The nvme command status if a response was received (see
  * &enum nvme_status_field) or -1 with errno set otherwise.
  */
-int nvme_dev_self_test(int fd, __u32 nsid, enum nvme_dst_stc stc);
+int nvme_dev_self_test(struct nvme_dev_self_test_args *args);
 
 /**
  * nvme_virtual_mgmt() - Virtualization resource management