.gitignore

@@ -1,9 +1 @@
-/libnvme-1.0.tar.gz
+SOURCES/libnvme-1.9.tar.gz
-/libnvme-1.1.tar.gz
-/libnvme-1.2.tar.gz
-/libnvme-1.4.tar.gz
-/libnvme-1.6.tar.gz
-/libnvme-1.8.tar.gz
-/libnvme-1.9.tar.gz
-/libnvme-1.10.tar.gz
-/libnvme-1.11.tar.gz

.libnvme.metadata

@@ -0,0 +1 @@
+7ce814bb26bd5fc33b99f5ba48d99538f23756cd SOURCES/libnvme-1.9.tar.gz

README.md

@@ -1,3 +0,0 @@
-# libnvme
-
-The libnvme package

SOURCES/0001-tree-handle-no-address-phy-slot-dirs.patch

@@ -0,0 +1,32 @@
+From 49a4cd8f62d05bb4e1b6e1365bad638c366cdba9 Mon Sep 17 00:00:00 2001
+From: Greg Joyce <gjoyce@linux.ibm.com>
+Date: Tue, 23 Jul 2024 01:04:42 +0530
+Subject: [PATCH] tree: handle no address phy slot dirs
+
+Not all directories have an address. Verify addr before calling
+strcmp().
+
+Fixes: 42ac45359635 ("tree: Add PCI physical slot number for controller")
+Signed-off-by: Greg Joyce <gjoyce@linux.ibm.com>
+---
+ src/nvme/tree.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/nvme/tree.c b/src/nvme/tree.c
+index 288b23c73a1b..b0ee94047634 100644
+--- a/src/nvme/tree.c
++++ b/src/nvme/tree.c
+@@ -1867,6 +1867,10 @@ static char *nvme_ctrl_lookup_phy_slot(nvme_root_t r, const char *address)
+ 				return NULL;
+ 			}
+ 			addr = nvme_get_attr(path, "address");
++
++			/* some directories don't have an address entry */
++			if (!addr)
++				continue;
+ 			if (strcmp(addr, target_addr) == 0)
+ 				return strdup(entry->d_name);
+ 		}
+-- 
+2.43.0
+

SOURCES/libnvme-1.10-uriparser.patch

@@ -0,0 +1,609 @@
+From 6829a6903c7a32a7b4dd32597c7f2a811b5a58bb Mon Sep 17 00:00:00 2001
+From: Tomas Bzatek <tbzatek@redhat.com>
+Date: Wed, 17 Apr 2024 18:04:34 +0200
+Subject: [PATCH 1/3] fabrics: Introduce simple URI parser
+
+A very simple URI parser implementing URI syntax described
+in the Boot Specification, rev. 1.0.
+
+Signed-off-by: Tomas Bzatek <tbzatek@redhat.com>
+---
+ src/libnvme.map    |   2 +
+ src/nvme/fabrics.c | 116 +++++++++++++++++++++++++++++++++++++++++++++
+ src/nvme/fabrics.h |  44 +++++++++++++++++
+ 3 files changed, 162 insertions(+)
+
+diff -up libnvme-1.9/src/libnvme.map.bak libnvme-1.9/src/libnvme.map
+--- libnvme-1.9/src/libnvme.map.bak	2024-05-03 14:08:20.000000000 +0200
++++ libnvme-1.9/src/libnvme.map	2024-06-21 15:46:53.920532333 +0200
+@@ -10,6 +10,8 @@ LIBNVME_1.9 {
+ 		nvme_submit_passthru64;
+ 		nvme_update_key;
+ 		nvme_ctrl_get_cntlid;
++		nvme_parse_uri;
++		nvme_free_uri;
+ };
+ 
+ LIBNVME_1_8 {
+diff --git a/src/nvme/fabrics.c b/src/nvme/fabrics.c
+index 6738e9dc..324a7321 100644
+--- a/src/nvme/fabrics.c
++++ b/src/nvme/fabrics.c
+@@ -1703,3 +1703,119 @@ int nvmf_register_ctrl(nvme_ctrl_t c, enum nvmf_dim_tas tas, __u32 *result)
+ 	 */
+ 	return nvmf_dim(c, tas, NVMF_TRTYPE_TCP, nvme_get_adrfam(c), "", NULL, result);
+ }
++
++struct nvme_fabrics_uri *nvme_parse_uri(const char *str)
++{
++	struct nvme_fabrics_uri *uri;
++	_cleanup_free_ char *scheme = NULL;
++	_cleanup_free_ char *authority = NULL;
++	_cleanup_free_ char *path = NULL;
++	const char *host;
++	int i;
++
++	/* As defined in Boot Specification rev. 1.0:
++	 *
++	 * section 1.5.7: NVMe-oF URI Format
++	 *  nvme+tcp://192.168.1.1:4420/
++	 *  nvme+tcp://[FE80::1010]:4420/
++	 *
++	 * section 3.1.2.5.3: DHCP Root-Path - a hierarchical NVMe-oF URI Format
++	 *  NVME<+PROTOCOL>://<SERVERNAME/IP>[:TRANSPORT PORT]/<SUBSYS NQN>/<NID>
++	 * or
++	 *  NVME<+PROTOCOL>://<DISCOVERY CONTROLLER ADDRESS>[:DISCOVERY-
++	 *  -CONTROLLER PORT]/NQN.2014-08.ORG.NVMEXPRESS.DISCOVERY/<NID>
++	 */
++
++	/* TODO: unescape? */
++
++	uri = calloc(1, sizeof(struct nvme_fabrics_uri));
++	if (!uri)
++		return NULL;
++
++	if (sscanf(str, "%m[^:/]://%m[^/?#]%ms",
++		   &scheme, &authority, &path) < 2) {
++		nvme_free_uri(uri);
++		errno = EINVAL;
++		return NULL;
++	}
++
++	if (sscanf(scheme, "%m[^+]+%ms",
++		   &uri->scheme, &uri->protocol) < 1) {
++		nvme_free_uri(uri);
++		errno = EINVAL;
++		return NULL;
++	}
++
++	/* split userinfo */
++	host = strrchr(authority, '@');
++	if (host) {
++		host++;
++		uri->userinfo = strndup(authority, host - authority);
++	} else
++		host = authority;
++
++	/* try matching IPv6 address first */
++	if (sscanf(host, "[%m[^]]]:%d",
++		   &uri->host, &uri->port) < 1)
++		/* treat it as IPv4/hostname */
++		if (sscanf(host, "%m[^:]:%d",
++			   &uri->host, &uri->port) < 1) {
++			nvme_free_uri(uri);
++			errno = EINVAL;
++			return NULL;
++		}
++
++	/* split path into elements */
++	if (path) {
++		char *e, *elem;
++
++		/* separate the fragment */
++		e = strrchr(path, '#');
++		if (e) {
++			uri->fragment = strdup(e + 1);
++			*e = '\0';
++		}
++		/* separate the query string */
++		e = strrchr(path, '?');
++		if (e) {
++			uri->query = strdup(e + 1);
++			*e = '\0';
++		}
++
++		/* count elements first */
++		for (i = 0, e = path; *e; e++)
++			if (*e == '/' && *(e + 1) != '/')
++				i++;
++		uri->path_segments = calloc(i + 2, sizeof(char *));
++
++		i = 0;
++		elem = strtok_r(path, "/", &e);
++		if (elem)
++			uri->path_segments[i++] = strdup(elem);
++		while (elem && strlen(elem)) {
++			elem = strtok_r(NULL, "/", &e);
++			if (elem)
++				uri->path_segments[i++] = strdup(elem);
++		}
++	}
++
++	return uri;
++}
++
++void nvme_free_uri(struct nvme_fabrics_uri *uri)
++{
++	char **s;
++
++	if (!uri)
++		return;
++	free(uri->scheme);
++	free(uri->protocol);
++	free(uri->userinfo);
++	free(uri->host);
++	for (s = uri->path_segments; s && *s; s++)
++		free(*s);
++	free(uri->path_segments);
++	free(uri->query);
++	free(uri->fragment);
++	free(uri);
++}
+diff --git a/src/nvme/fabrics.h b/src/nvme/fabrics.h
+index 4ebeb35e..3be35310 100644
+--- a/src/nvme/fabrics.h
++++ b/src/nvme/fabrics.h
+@@ -67,6 +67,28 @@ struct nvme_fabrics_config {
+ 	bool concat;
+ };
+ 
++/**
++ * struct nvme_fabrics_uri - Parsed URI structure
++ * @scheme:		Scheme name (typically 'nvme')
++ * @protocol:		Optional protocol/transport (e.g. 'tcp')
++ * @userinfo:		Optional user information component of the URI authority
++ * @host:		Host transport address
++ * @port:		The port subcomponent or 0 if not specified
++ * @path_segments:	NULL-terminated array of path segments
++ * @query:		Optional query string component (separated by '?')
++ * @fragment:		Optional fragment identifier component (separated by '#')
++ */
++struct nvme_fabrics_uri {
++	char *scheme;
++	char *protocol;
++	char *userinfo;
++	char *host;
++	int port;
++	char **path_segments;
++	char *query;
++	char *fragment;
++};
++
+ /**
+  * nvmf_trtype_str() - Decode TRTYPE field
+  * @trtype: value to be decoded
+@@ -324,4 +346,26 @@ bool nvmf_is_registration_supported(nvme_ctrl_t c);
+  */
+ int nvmf_register_ctrl(nvme_ctrl_t c, enum nvmf_dim_tas tas, __u32 *result);
+ 
++/**
++ * nvme_parse_uri() - Parse the URI string
++ * @str:	URI string
++ *
++ * Parse the URI string as defined in the NVM Express Boot Specification.
++ * Supported URI elements looks as follows:
++ *
++ *   nvme+tcp://user@host:port/subsys_nqn/nid?query=val#fragment
++ *
++ * Return: &nvme_fabrics_uri structure on success; NULL on failure with errno
++ * set.
++ */
++struct nvme_fabrics_uri *nvme_parse_uri(const char *str);
++
++/**
++ * nvme_free_uri() - Free the URI structure
++ * @uri:	&nvme_fabrics_uri structure
++ *
++ * Free an &nvme_fabrics_uri structure.
++ */
++void nvme_free_uri(struct nvme_fabrics_uri *uri);
++
+ #endif /* _LIBNVME_FABRICS_H */
+
+From 27ea060ef42c76ed1c88d92c435b88b481e7defb Mon Sep 17 00:00:00 2001
+From: Tomas Bzatek <tbzatek@redhat.com>
+Date: Wed, 17 Apr 2024 18:06:23 +0200
+Subject: [PATCH 2/3] tests: Add uriparser tests
+
+Simple testcase both for valid and malformed URI strings.
+
+Signed-off-by: Tomas Bzatek <tbzatek@redhat.com>
+---
+ test/meson.build |   9 ++
+ test/uriparser.c | 208 +++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 217 insertions(+)
+ create mode 100644 test/uriparser.c
+
+diff --git a/test/meson.build b/test/meson.build
+index 93e69991..55992df7 100644
+--- a/test/meson.build
++++ b/test/meson.build
+@@ -66,6 +66,15 @@ uuid = executable(
+ 
+ test('uuid', uuid)
+ 
++uriparser = executable(
++    'test-uriparser',
++    ['uriparser.c'],
++    dependencies: libnvme_dep,
++    include_directories: [incdir, internal_incdir]
++)
++
++test('uriparser', uriparser)
++
+ if conf.get('HAVE_NETDB')
+     mock_ifaddrs = library(
+         'mock-ifaddrs',
+diff --git a/test/uriparser.c b/test/uriparser.c
+new file mode 100644
+index 00000000..cf26bfd2
+--- /dev/null
++++ b/test/uriparser.c
+@@ -0,0 +1,208 @@
++// SPDX-License-Identifier: LGPL-2.1-or-later
++/**
++ * This file is part of libnvme.
++ * Copyright (c) 2024 Tomas Bzatek <tbzatek@redhat.com>
++ */
++
++#include <assert.h>
++#include <string.h>
++#include <stdbool.h>
++#include <stdlib.h>
++
++#include <ccan/array_size/array_size.h>
++
++#include <libnvme.h>
++#include <nvme/private.h>
++
++struct test_data {
++	const char *uri;
++	/* parsed data */
++	const char *scheme;
++	const char *host;
++	const char *user;
++	const char *proto;
++	int port;
++	const char *path[7];
++	const char *query;
++	const char *frag;
++};
++
++static struct test_data test_data[] = {
++	{ "nvme://192.168.1.1",  "nvme", "192.168.1.1" },
++	{ "nvme://192.168.1.1/", "nvme", "192.168.1.1" },
++	{ "nvme://192.168.1.1:1234",  "nvme", "192.168.1.1", .port = 1234 },
++	{ "nvme://192.168.1.1:1234/", "nvme", "192.168.1.1", .port = 1234 },
++	{ "nvme+tcp://192.168.1.1",   "nvme", "192.168.1.1", .proto = "tcp" },
++	{ "nvme+rdma://192.168.1.1/", "nvme", "192.168.1.1", .proto = "rdma" },
++	{ "nvme+tcp://192.168.1.1:1234",
++	  "nvme", "192.168.1.1", .proto = "tcp", .port = 1234 },
++	{ "nvme+tcp://192.168.1.1:1234/",
++	  "nvme", "192.168.1.1", .proto = "tcp", .port = 1234 },
++	{ "nvme+tcp://192.168.1.1:4420/path",
++	  "nvme", "192.168.1.1", .proto = "tcp", .port = 4420,
++	  .path = { "path", NULL }},
++	{ "nvme+tcp://192.168.1.1/path/",
++	  "nvme", "192.168.1.1", .proto = "tcp", .path = { "path", NULL }},
++	{ "nvme+tcp://192.168.1.1:4420/p1/p2/p3",
++	  "nvme", "192.168.1.1", .proto = "tcp", .port = 4420,
++	  .path = { "p1", "p2", "p3", NULL }},
++	{ "nvme+tcp://192.168.1.1:4420/p1/p2/p3/",
++	  "nvme", "192.168.1.1", .proto = "tcp", .port = 4420,
++	  .path = { "p1", "p2", "p3", NULL }},
++	{ "nvme+tcp://192.168.1.1:4420//p1//p2/////p3",
++	  "nvme", "192.168.1.1", .proto = "tcp", .port = 4420,
++	  .path = { "p1", "p2", "p3", NULL }},
++	{ "nvme+tcp://192.168.1.1:4420//p1//p2/////p3/",
++	  "nvme", "192.168.1.1", .proto = "tcp", .port = 4420,
++	  .path = { "p1", "p2", "p3", NULL }},
++	{ "nvme://[fe80::1010]",  "nvme", "fe80::1010" },
++	{ "nvme://[fe80::1010]/", "nvme", "fe80::1010" },
++	{ "nvme://[fe80::1010]:1234",  "nvme", "fe80::1010", .port = 1234 },
++	{ "nvme://[fe80::1010]:1234/", "nvme", "fe80::1010", .port = 1234 },
++	{ "nvme+tcp://[fe80::1010]",   "nvme", "fe80::1010", .proto = "tcp" },
++	{ "nvme+rdma://[fe80::1010]/", "nvme", "fe80::1010", .proto = "rdma" },
++	{ "nvme+tcp://[fe80::1010]:1234",
++	  "nvme", "fe80::1010", .proto = "tcp", .port = 1234 },
++	{ "nvme+tcp://[fe80::1010]:1234/",
++	  "nvme", "fe80::1010", .proto = "tcp", .port = 1234 },
++	{ "nvme+tcp://[fe80::1010]:4420/path",
++	  "nvme", "fe80::1010", .proto = "tcp", .port = 4420,
++	  .path = { "path", NULL }},
++	{ "nvme+tcp://[fe80::1010]/path/",
++	  "nvme", "fe80::1010", .proto = "tcp", .path = { "path", NULL }},
++	{ "nvme+tcp://[fe80::1010]:4420/p1/p2/p3",
++	  "nvme", "fe80::1010", .proto = "tcp", .port = 4420,
++	  .path = { "p1", "p2", "p3", NULL }},
++	{ "nvme+tcp://[fe80::fc7d:8cff:fe5b:962e]:666/p1/p2/p3/",
++	  "nvme", "fe80::fc7d:8cff:fe5b:962e", .proto = "tcp", .port = 666,
++	  .path = { "p1", "p2", "p3", NULL }},
++	{ "nvme://h?query",  "nvme", "h", .query = "query" },
++	{ "nvme://h/?query", "nvme", "h", .query = "query" },
++	{ "nvme://h/x?query",
++	  "nvme", "h", .path = { "x" }, .query = "query" },
++	{ "nvme://h/p1/?query",
++	  "nvme", "h", .path = { "p1" }, .query = "query" },
++	{ "nvme://h/p1/x?query",
++	  "nvme", "h", .path = { "p1", "x" }, .query = "query" },
++	{ "nvme://h#fragment",  "nvme", "h", .frag = "fragment" },
++	{ "nvme://h/#fragment", "nvme", "h", .frag = "fragment" },
++	{ "nvme://h/x#fragment",
++	  "nvme", "h", .path = { "x" }, .frag = "fragment" },
++	{ "nvme://h/p1/#fragment",
++	  "nvme", "h", .path = { "p1" }, .frag = "fragment" },
++	{ "nvme://h/p1/x#fragment",
++	  "nvme", "h", .path = { "p1", "x" }, .frag = "fragment" },
++	{ "nvme://h/?query#fragment",
++	  "nvme", "h", .query = "query", .frag = "fragment" },
++	{ "nvme://h/x?query#fragment",
++	  "nvme", "h", .path = { "x" }, .query = "query", .frag = "fragment" },
++	{ "nvme://h/p1/?query#fragment",
++	  "nvme", "h", .path = { "p1" }, .query = "query", .frag = "fragment" },
++	{ "nvme://h/p1/x?query#fragment",
++	  "nvme", "h", .path = { "p1", "x" }, .query = "query",
++	   .frag = "fragment" },
++	{ "nvme://h/#fragment?query",
++	  "nvme", "h", .frag = "fragment?query" },
++	{ "nvme://h/x#fragment?query",
++	  "nvme", "h", .path = { "x" }, .frag = "fragment?query" },
++	{ "nvme://h/p1/#fragment?query",
++	  "nvme", "h", .path = { "p1" }, .frag = "fragment?query" },
++	{ "nvme://h/p1/x#fragment?query",
++	  "nvme", "h", .path = { "p1", "x" }, .frag = "fragment?query" },
++	{ "nvme://user@h",  "nvme", "h", .user = "user" },
++	{ "nvme://user@h/", "nvme", "h", .user = "user" },
++	{ "nvme://user:pass@h/", "nvme", "h", .user = "user:pass" },
++	{ "nvme://[fe80::1010]@h/", "nvme", "h", .user = "[fe80::1010]" },
++	{ "nvme://u[fe80::1010]@h/", "nvme", "h", .user = "u[fe80::1010]" },
++	{ "nvme://u[aa:bb::cc]@h/", "nvme", "h", .user = "u[aa:bb::cc]" },
++	{ "nvme+rdma://u[aa:bb::cc]@[aa:bb::cc]:12345/p1/x?q=val#fr",
++	  "nvme", "aa:bb::cc", .proto = "rdma", .port = 12345,
++	  .user = "u[aa:bb::cc]", .path = { "p1", "x" },
++	  .query = "q=val", .frag = "fr" },
++};
++
++const char *test_data_bad[] = {
++	"",
++	" ",
++	"nonsense",
++	"vnme:",
++	"vnme:/",
++	"vnme://",
++	"vnme:///",
++	"vnme+foo://",
++	"nvme:hostname/",
++	"nvme:/hostname/",
++	"nvme:///hostname/",
++	"nvme+foo:///hostname/",
++};
++
++static void test_uriparser(void)
++{
++	printf("Testing URI parser:\n");
++	for (int i = 0; i < ARRAY_SIZE(test_data); i++) {
++		const struct test_data *d = &test_data[i];
++		struct nvme_fabrics_uri *parsed_data;
++		char **s;
++		int i;
++
++		printf(" '%s'...", d->uri);
++		parsed_data = nvme_parse_uri(d->uri);
++		assert(parsed_data);
++
++		assert(strcmp(d->scheme, parsed_data->scheme) == 0);
++		if (d->proto) {
++			assert(parsed_data->protocol != NULL);
++			assert(strcmp(d->proto, parsed_data->protocol) == 0);
++		} else
++			assert(d->proto == parsed_data->protocol);
++		assert(strcmp(d->host, parsed_data->host) == 0);
++		assert(d->port == parsed_data->port);
++
++		if (!parsed_data->path_segments)
++			assert(d->path[0] == NULL);
++		else {
++			for (i = 0, s = parsed_data->path_segments;
++			     s && *s; s++, i++) {
++				assert(d->path[i] != NULL);
++				assert(strcmp(d->path[i], *s) == 0);
++			}
++			/* trailing NULL element */
++			assert(d->path[i] == parsed_data->path_segments[i]);
++		}
++		if (d->query) {
++			assert(parsed_data->query != NULL);
++			assert(strcmp(d->query, parsed_data->query) == 0);
++		} else
++			assert(d->query == parsed_data->query);
++		if (d->frag) {
++			assert(parsed_data->fragment != NULL);
++			assert(strcmp(d->frag, parsed_data->fragment) == 0);
++		} else
++			assert(d->frag == parsed_data->fragment);
++		nvme_free_uri(parsed_data);
++		printf("  OK\n");
++	}
++}
++
++static void test_uriparser_bad(void)
++{
++	printf("Testing malformed URI strings:\n");
++	for (int i = 0; i < ARRAY_SIZE(test_data_bad); i++) {
++		struct nvme_fabrics_uri *parsed_data;
++
++		printf(" '%s'...", test_data_bad[i]);
++		parsed_data = nvme_parse_uri(test_data_bad[i]);
++		assert(parsed_data == NULL);
++		printf("   OK\n");
++	}
++}
++
++int main(int argc, char *argv[])
++{
++	test_uriparser();
++	test_uriparser_bad();
++
++	fflush(stdout);
++
++	return 0;
++}
+
+From b2044e8f416b54df34e0d162b59ca0745db92927 Mon Sep 17 00:00:00 2001
+From: Tomas Bzatek <tbzatek@redhat.com>
+Date: Mon, 13 May 2024 17:38:25 +0200
+Subject: [PATCH 3/3] fabrics: Unescape URI elements
+
+This adds support for unescaping percent-encoded URI parts.
+
+Signed-off-by: Tomas Bzatek <tbzatek@redhat.com>
+---
+ src/nvme/fabrics.c | 47 +++++++++++++++++++++++++++++++++++++---------
+ test/uriparser.c   | 13 +++++++++++++
+ 2 files changed, 51 insertions(+), 9 deletions(-)
+
+diff --git a/src/nvme/fabrics.c b/src/nvme/fabrics.c
+index 324a7321..e5921f8b 100644
+--- a/src/nvme/fabrics.c
++++ b/src/nvme/fabrics.c
+@@ -1704,12 +1704,41 @@ int nvmf_register_ctrl(nvme_ctrl_t c, enum nvmf_dim_tas tas, __u32 *result)
+ 	return nvmf_dim(c, tas, NVMF_TRTYPE_TCP, nvme_get_adrfam(c), "", NULL, result);
+ }
+ 
++#define IS_XDIGIT(c) ((c >= '0' && c <= '9') || \
++		      (c >= 'A' && c <= 'F') || \
++		      (c >= 'a' && c <= 'f'))
++#define XDIGIT_VAL(c) ((c >= '0' && c <= '9') ? c - '0' : ( \
++		       (c >= 'A' && c <= 'F') ? c - 'A' + 10 : c - 'a' + 10))
++
++/* returns newly allocated string */
++static char *unescape_uri(const char *str, int len)
++{
++	char *dst;
++	int l;
++	int i, j;
++
++	l = len > 0 ? len : strlen(str);
++	dst = malloc(l + 1);
++	for (i = 0, j = 0; i < l; i++, j++) {
++		if (str[i] == '%' && i + 2 < l &&
++		    IS_XDIGIT(str[i + 1]) && IS_XDIGIT(str[i + 2])) {
++			dst[j] = (XDIGIT_VAL(str[i + 1]) << 4) +
++				  XDIGIT_VAL(str[i + 2]);
++			i += 2;
++		} else
++			dst[j] = str[i];
++	}
++	dst[j] = '\0';
++	return dst;
++}
++
+ struct nvme_fabrics_uri *nvme_parse_uri(const char *str)
+ {
+ 	struct nvme_fabrics_uri *uri;
+ 	_cleanup_free_ char *scheme = NULL;
+ 	_cleanup_free_ char *authority = NULL;
+ 	_cleanup_free_ char *path = NULL;
++	_cleanup_free_ char *h = NULL;
+ 	const char *host;
+ 	int i;
+ 
+@@ -1726,8 +1755,6 @@ struct nvme_fabrics_uri *nvme_parse_uri(const char *str)
+ 	 *  -CONTROLLER PORT]/NQN.2014-08.ORG.NVMEXPRESS.DISCOVERY/<NID>
+ 	 */
+ 
+-	/* TODO: unescape? */
+-
+ 	uri = calloc(1, sizeof(struct nvme_fabrics_uri));
+ 	if (!uri)
+ 		return NULL;
+@@ -1750,20 +1777,22 @@ struct nvme_fabrics_uri *nvme_parse_uri(const char *str)
+ 	host = strrchr(authority, '@');
+ 	if (host) {
+ 		host++;
+-		uri->userinfo = strndup(authority, host - authority);
++		uri->userinfo = unescape_uri(authority, host - authority);
+ 	} else
+ 		host = authority;
+ 
+ 	/* try matching IPv6 address first */
+ 	if (sscanf(host, "[%m[^]]]:%d",
+-		   &uri->host, &uri->port) < 1)
++		   &uri->host, &uri->port) < 1) {
+ 		/* treat it as IPv4/hostname */
+ 		if (sscanf(host, "%m[^:]:%d",
+-			   &uri->host, &uri->port) < 1) {
++			   &h, &uri->port) < 1) {
+ 			nvme_free_uri(uri);
+ 			errno = EINVAL;
+ 			return NULL;
+ 		}
++		uri->host = unescape_uri(h, 0);
++	}
+ 
+ 	/* split path into elements */
+ 	if (path) {
+@@ -1772,13 +1801,13 @@ struct nvme_fabrics_uri *nvme_parse_uri(const char *str)
+ 		/* separate the fragment */
+ 		e = strrchr(path, '#');
+ 		if (e) {
+-			uri->fragment = strdup(e + 1);
++			uri->fragment = unescape_uri(e + 1, 0);
+ 			*e = '\0';
+ 		}
+ 		/* separate the query string */
+ 		e = strrchr(path, '?');
+ 		if (e) {
+-			uri->query = strdup(e + 1);
++			uri->query = unescape_uri(e + 1, 0);
+ 			*e = '\0';
+ 		}
+ 
+@@ -1791,11 +1820,11 @@ struct nvme_fabrics_uri *nvme_parse_uri(const char *str)
+ 		i = 0;
+ 		elem = strtok_r(path, "/", &e);
+ 		if (elem)
+-			uri->path_segments[i++] = strdup(elem);
++			uri->path_segments[i++] = unescape_uri(elem, 0);
+ 		while (elem && strlen(elem)) {
+ 			elem = strtok_r(NULL, "/", &e);
+ 			if (elem)
+-				uri->path_segments[i++] = strdup(elem);
++				uri->path_segments[i++] = unescape_uri(elem, 0);
+ 		}
+ 	}
+ 
+diff --git a/test/uriparser.c b/test/uriparser.c
+index cf26bfd2..09b2a732 100644
+--- a/test/uriparser.c
++++ b/test/uriparser.c
+@@ -119,6 +119,19 @@ static struct test_data test_data[] = {
+ 	  "nvme", "aa:bb::cc", .proto = "rdma", .port = 12345,
+ 	  .user = "u[aa:bb::cc]", .path = { "p1", "x" },
+ 	  .query = "q=val", .frag = "fr" },
++	{ "nvme://ex%5Cmp%3Ae",  "nvme", "ex\\mp:e" },
++	{ "nvme://ex%5Cmp%3Ae.com/", "nvme", "ex\\mp:e.com" },
++	{ "nvme://u%24er@ex%5Cmp%3Ae.com/", "nvme", "ex\\mp:e.com",
++	  .user = "u$er" },
++	{ "nvme+tcp://ex%5Cmp%3Ae.com:1234",
++	  "nvme", "ex\\mp:e.com", .proto = "tcp", .port = 1234 },
++	{ "nvme+tcp://ex%5Cmp%3Ae.com:1234/p1/ex%3Camp%3Ele/p3",
++	  "nvme", "ex\\mp:e.com", .proto = "tcp", .port = 1234,
++	  .path = { "p1", "ex<amp>le", "p3", NULL } },
++	{ "nvme+tcp://ex%5Cmp%3Ae.com:1234/p1/%3C%3E/p3?q%5E%24ry#fr%26gm%23nt",
++	  "nvme", "ex\\mp:e.com", .proto = "tcp", .port = 1234,
++	  .path = { "p1", "<>", "p3", NULL }, .query = "q^$ry",
++	  .frag = "fr&gm#nt" },
+ };
+ 
+ const char *test_data_bad[] = {

SPECS/libnvme.spec

@@ -3,12 +3,16 @@
 
 Name:    libnvme
 Summary: Linux-native nvme device management library
-Version: 1.11
+Version: 1.9
-Release: 1%{?dist}
+Release: 3%{?dist}
 License: LGPL-2.1-or-later
 URL:     https://github.com/linux-nvme/libnvme
 Source0: %{url}/archive/v%{version_no_tilde}/%{name}-%{version_no_tilde}.tar.gz
 
+# https://issues.redhat.com/browse/RHEL-37608
+Patch0:  libnvme-1.10-uriparser.patch
+Patch1:  0001-tree-handle-no-address-phy-slot-dirs.patch
+
 BuildRequires: gcc gcc-c++
 BuildRequires: swig
 BuildRequires: python3-devel
@@ -71,9 +75,9 @@ mv %{buildroot}/usr/*.rst %{buildroot}%{_pkgdocdir}/
 %files
 %license COPYING ccan/licenses/*
 %{_libdir}/libnvme.so.1
-%{_libdir}/libnvme.so.1.11.0
+%{_libdir}/libnvme.so.1.9.0
 %{_libdir}/libnvme-mi.so.1
-%{_libdir}/libnvme-mi.so.1.11.0
+%{_libdir}/libnvme-mi.so.1.9.0
 
 %files devel
 %{_libdir}/libnvme.so
@@ -93,12 +97,6 @@ mv %{buildroot}/usr/*.rst %{buildroot}%{_pkgdocdir}/
 %{python3_sitearch}/libnvme/*
 
 %changelog
-* Tue Nov 12 2024 Maurizio Lombardi <mlombard@redhat.com> - 1.11-1
-- Update libnvme to version 1.11 (RHEL-67145)
-
-* Mon Oct 07 2024 Maurizio Lombardi <mlombard@redhat.com> - 1.10-1
-- Update to latest upstream version RHEL-61573
-
 * Thu Aug 01 2024 Maurizio Lombardi <mlombard@redhat.com> - 1.9-3
 - Backport fix for RHEL-49544
 

gating.yaml

@@ -1,6 +0,0 @@
---- !Policy
-product_versions:
-  - rhel-9
-decision_context: osci_compose_gate
-rules:
-  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}

sources

@@ -1 +0,0 @@
-SHA512 (libnvme-1.11.tar.gz) = 5c1d00fe57ff699be01c326e24612da25e1772578928e2c70fb5f67e8a9fe0fa4c95e18f58d4abefa0e163e99c9e37b1109298e805e174b033e749d19865336b

tests/include/tc.sh

@@ -1,272 +0,0 @@
-#!/bin/bash
-
-# Copyright (c) 2016 Red Hat, Inc.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Author: Yi Zhang  <yizhan@redhat.com>
-
-# filename: function
-
-# USAGE
-
-test x$LXT_TC = x || return
-LXT_TC=1
-
-#
-# print the current date
-# usage: d=$(tdate)
-#
-tdate ()
-{
-    date '+%T' 2>/dev/null
-}
-
-#
-# print the log information
-# usage: tlog "hello world" "WARNING"
-#
-tlog ()
-{
-    local msg=$1
-    local log_level=${2:-INFO}
-    local cur_date=$(tdate)
-
-    echo "[$log_level][$cur_date]$msg"
-
-    return 0
-}
-
-#
-# run the cmd and format the log. return the exitint status of cmd
-# use the global variables: tSTDOUT and tSTDERR to return the stdout and stderr
-# usage: trun "ls"
-#        trun "ls"; echo $?
-#        stdout=$tSTDOUT
-#        stderr=$tSTDERR
-#
-trun ()
-{
-    local cmd="$*"
-
-    _trun_ "$cmd"
-}
-
-#
-# verify the execution of command
-# if the cmd return 0, mark this checkpoint failed and return 1
-# if not, mark it passed and return 0
-# usage: tnot "ls /not_existing"
-#
-tnot () {
-    local cmd="$*"
-    _trun_ "$cmd" 1
-    if test $? -eq 0; then
-        tfail_ "$cmd" ;
-    else
-        tpass_ "$cmd" ;
-    fi
-}
-
-#
-# verify the execution of command
-# if the cmd return 0, mark this checkpoint passed and return 0
-# if not, mark it failed and return 1
-# usage: tok "ls /"
-#
-tok ()
-{
-    local cmd="$*"
-    _trun_ "$cmd" 0
-    if test $? -eq 0; then
-        tpass_ "$cmd" ;
-    else
-        tfail_ "$cmd" ;
-    fi
-}
-
-#
-# verify the execution of command
-# if the cmd return 0, mark this checkpoint passed and return 0
-# if not, mark it failes and exit
-# usage: terr "ls"
-#
-#terr ()
-#{
-#    tok "$*" || tend
-#}
-
-#
-# verify the execution of command
-# if the cmd return 0, will continue to run the script
-# if not, mark it failes and exit
-# usage: terr "ls"
-#
-terr ()
-{
-    local cmd="$*"
-    _trun_ "$cmd" 0
-    if test $? -ne 0; then
-        tfail_ "$cmd" ;
-        tend ;
-    fi
-}
-
-#
-# exit the program and print the log message
-# usage: texit "error message" 100
-# similar to the exception
-#
-texit ()
-{
-    msg=$1
-    err=$2
-    is_null $err && err=1
-    test $err -lt 1 || err=1
-
-    tlog "$msg" "ERROR"
-    exit $2
-}
-
-#
-# print the test report, cleanup the testing bed and  close the testing.
-# usage: tend
-#
-tend ()
-{
-    local pcount=$(wc -l $tPASS_FILE | awk '{print $1}')
-    local fcount=$(wc -l $tFAIL_FILE | awk '{print $1}')
-    local total=$(( $pcount + $fcount ))
-
-    echo "#################################Test Report###############################"
-    echo "TOTAL   : $total"
-    echo "PASSED  : $pcount"
-    echo "FAILED  : $fcount"
-    cat $tPASS_FILE $tFAIL_FILE
-    echo "###########################End of running $0########################"
-
-#cleanup
-    rm -f $tPASS_FILE $tFAIL_FILE $tRETURN_FILE $tSTDERR_FILE
-#   rm -rf $LXT_TMP_DIR
-	if [[ $pcount -eq 0 ]] && [[ $total -eq 0 ]];then
-	  exit 0
-    fi
-    test $pcount -eq 0 && exit 1
-    test $pcount -eq $total && exit 0
-    exit 1
-}
-
-#
-# private function
-#
-
-#
-# print the error message and call stack. return 1
-#
-tfail_ ()
-{
-    local msg=$*
-    tlog "$msg" "ERROR" >>$tFAIL_FILE
-
-    return 1
-}
-
-#
-# print the sucessful message. return 0
-#
-tpass_ ()
-{
-    local msg=$*
-    tlog "$msg" "PASS" >> $tPASS_FILE
-
-    return 0
-}
-
-_trun_ ()
-{
-    local cmd="$1"
-    local chk="$2"
-    local cur_date=$(tdate)
-
-    local stdout=$(eval "$cmd" 2>$tSTDERR_FILE; echo $? >$tRETURN_FILE 2>/dev/null)
-#timeout -- how to set timeout?
-    local exit_status=$(< $tRETURN_FILE)
-    local stderr=$(< $tSTDERR_FILE)
-    local msg=CMD
-#tnot
-    if test x$chk = x1; then
-        test $exit_status -eq 0 || msg=PASS
-        test $exit_status -eq 0 && msg=FAIL
-#should let the tester know this is the negative testing
-#if cmd return 0 we will return 1 and vice versa
-        cmd="[NOT] $cmd"
-    fi
-#tok
-    if test x$chk = x0; then
-        test $exit_status -eq 0 && msg=PASS
-        test $exit_status -eq 0 || msg=FAIL
-    fi
-
-    tSTDOUT=$stdout
-    tSTDERR=$stderr
-
-    test $tIGNORE_STDOUT -eq 1 && stdout='redirect the stdout to /dev/null'
-    test $tIGNORE_STDERR -eq 1 && stderr='redirect the stderr to /dev/null'
-
-    echo "[$msg][$cur_date][$HOSTNAME]$cmd"
-    echo "STDOUT:"
-    test "x$stdout" = x || echo "$stdout"
-    echo "STDERR:$stderr"
-    echo "RETURN:$exit_status"
-    echo
-
-    return $exit_status
-}
-
-#
-# setup the testing environment
-#
-_tsetup_ ()
-{
-
-    LXT_TMP_DIR="/mnt/testarea/lxt";
-
-    test -z "$HOSTNAME" && HOSTNAME=$(hostname)
-    test -d "$LXT_TMP_DIR" || mkdir -p "$LXT_TMP_DIR" >& /dev/null || exit 1
-
-    tSTDERR_FILE="$LXT_TMP_DIR/stderr.$$"
-    test -e "$tSTDERR_FILE" || > "$tSTDERR_FILE" || exit 1
-    tRETURN_FILE="$LXT_TMP_DIR/return.$$"
-    test -e "$tRETURN_FILE" || > "$tRETURN_FILE" || exit 1
-    tPASS_FILE="$LXT_TMP_DIR/tc.pass.$$"
-    test -e "$tPASS_FILE" || > "$tPASS_FILE" || exit 1
-    tFAIL_FILE="$LXT_TMP_DIR/tc.fail.$$"
-    test -e "$tFAIL_FILE" || > "$tFAIL_FILE" || exit 1
-}
-
-#
-# main
-#
-
-# global variables
-tIGNORE_STDOUT=0
-tIGNORE_STDERR=0
-tSTDOUT=
-tSTDERR=
-#LXT_TMP_DIR
-# only used in this file
-tPASS_FILE=
-tFAIL_FILE=
-
-_tsetup_

tests/sanity/LICENSE

@@ -1,675 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
-

tests/sanity/Makefile

@@ -1,47 +0,0 @@
-#!/bin/bash
-
-# Copyright (c) 2016 Red Hat, Inc.
-# #
-# # This program is free software: you can redistribute it and/or modify
-# # it under the terms of the GNU General Public License as published by
-# # the Free Software Foundation, either version 3 of the License, or
-# # (at your option) any later version.
-# #
-# # This program is distributed in the hope that it will be useful,
-# # but WITHOUT ANY WARRANTY; without even the implied warranty of
-# # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# # GNU General Public License for more details.
-# #
-# # You should have received a copy of the GNU General Public License
-# # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# # Author: Yi Zhang  <yizhan@redhat.com>
-
-.PHONY: all install download clean LICENSE
-
-BUILT_FILES=
-
-FILES=$(METADATA) Makefile PURPOSE main.sh
-
-run: $(FILES) build
-	./main.sh
-
-build: $(BUILT_FILES)
-	chmod a+x ./main.sh
-
-clean:
-	rm -f *~ *.rpm $(BUILT_FILES)
-
-$(METADATA): Makefile
-	@touch $(METADATA)
-	@echo "Owner:        Yi Zhang <yizhan@redhat.com>" > $(METADATA)
-	@echo "Name:         $(TEST)" >> $(METADATA)
-	@echo "Path:         $(TEST_DIR)"	>> $(METADATA)
-	@echo "License:      GPLv3" >> $(METADATA)
-	@echo "TestVersion:  $(TESTVERSION)"	>> $(METADATA)
-	@echo "Description:  libnvme sanity test" >> $(METADATA)
-	@echo "TestTime:     15m" >> $(METADATA)
-	@echo "RunFor:       libnvme" >> $(METADATA)
-	@echo "Requires:     libnvme" >> $(METADATA)
-
-	rhts-lint $(METADATA)

tests/sanity/PURPOSE

@@ -1 +0,0 @@
-Sanity test for libnvme package

tests/sanity/main.sh

@@ -1,36 +0,0 @@
-#!/bin/bash
-
-# Copyright (c) 2016 Red Hat, Inc.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Author: Yi Zhang  <yizhan@redhat.com>
-
-#set -x
-source ../include/tc.sh || exit 200
-
-tlog "running $0"
-
-tok "yum -y reinstall libnvme"
-tok "yum -y remove libnvme"
-tok "yum -y install libnvme"
-#tok "which nvme"
-tok "yum info libnvme"
-#tok "[[ -f "/usr/sbin/nvme" ]]"
-#tok "nvme list"
-#trun "nvme list-subsys"
-#tok "nvme version"
-#tok "nvme help"
-
-tend

tests/sanity/runtest.sh

@@ -1,36 +0,0 @@
-#!/bin/bash
-
-# Copyright (c) 2016 Red Hat, Inc.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Author: Yi Zhang  <yizhan@redhat.com>
-
-#set -x
-source ../include/tc.sh || exit 200
-
-tlog "running $0"
-
-tok "yum -y reinstall libnvme"
-tok "yum -y remove libnvme"
-tok "yum -y install libnvme"
-#tok "which nvme"
-tok "yum info libnvme"
-#tok "[[ -f "/usr/sbin/nvme" ]]"
-#tok "nvme list"
-#trun "nvme list-subsys"
-#tok "nvme version"
-#tok "nvme help"
-
-tend

tests/tests.yml

@@ -1,9 +0,0 @@
-- hosts: localhost
-  roles:
-  - role: standard-test-basic
-    tags:
-    - classic
-    tests:
-     - sanity
-    required_packages:
-     - which