From 7c6488aa09cbbd8592cda47ca55645e01fe02df8 Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek@redhat.com>
Date: Feb 09 2024 13:47:14 +0000
Subject: * Fri Feb 09 2024 Tomas Bzatek <tbzatek@redhat.com> - 2.7.1-4

- Lower the verbosity of TP4126 hostnqn-hostid consistency checks

---

diff --git a/nvme-cli-2.8.0-TP4126-lower_hostnqn_warnings.patch b/nvme-cli-2.8.0-TP4126-lower_hostnqn_warnings.patch
new file mode 100644
index 0000000..b1c0306
--- /dev/null
+++ b/nvme-cli-2.8.0-TP4126-lower_hostnqn_warnings.patch
@@ -0,0 +1,68 @@
+From 252929069d6c9042e9c95f41788006cb3eb2f452 Mon Sep 17 00:00:00 2001
+From: Martin George <marting@netapp.com>
+Date: Tue, 19 Dec 2023 21:59:07 +0530
+Subject: [PATCH] fabrics: move hostid/hostnqn warnings to verbose level
+
+Currently nvme connect prints an annoying "use hostid which
+does not match uuid in hostnqn" warning even for normal
+scenarios when both the hostid and hostnqn files are present.
+So move these warnings to verbose level instead.
+
+Signed-off-by: Martin George <marting@netapp.com>
+---
+ fabrics.c | 14 +++++++++-----
+ 1 file changed, 9 insertions(+), 5 deletions(-)
+
+diff --git a/fabrics.c b/fabrics.c
+index 2a0ad7089..dcae9aead 100644
+--- a/fabrics.c
++++ b/fabrics.c
+@@ -632,7 +632,7 @@ char *nvmf_hostid_from_hostnqn(const char *hostnqn)
+ 	return strdup(uuid + strlen("uuid:"));
+ }
+ 
+-void nvmf_check_hostid_and_hostnqn(const char *hostid, const char *hostnqn)
++void nvmf_check_hostid_and_hostnqn(const char *hostid, const char *hostnqn, unsigned int verbose)
+ {
+ 	char *hostid_from_file, *hostid_from_hostnqn;
+ 
+@@ -641,7 +641,9 @@ void nvmf_check_hostid_and_hostnqn(const char *hostid, const char *hostnqn)
+ 
+ 	hostid_from_file = nvmf_hostid_from_file();
+ 	if (hostid_from_file && strcmp(hostid_from_file, hostid)) {
+-		fprintf(stderr, "warning: use generated hostid instead of hostid file\n");
++		if (verbose)
++			fprintf(stderr,
++				"warning: use generated hostid instead of hostid file\n");
+ 		free(hostid_from_file);
+ 	}
+ 
+@@ -650,7 +652,9 @@ void nvmf_check_hostid_and_hostnqn(const char *hostid, const char *hostnqn)
+ 
+ 	hostid_from_hostnqn = nvmf_hostid_from_hostnqn(hostnqn);
+ 	if (hostid_from_hostnqn && strcmp(hostid_from_hostnqn, hostid)) {
+-		fprintf(stderr, "warning: use hostid which does not match uuid in hostnqn\n");
++		if (verbose)
++			fprintf(stderr,
++				"warning: use hostid which does not match uuid in hostnqn\n");
+ 		free(hostid_from_hostnqn);
+ 	}
+ }
+@@ -741,7 +745,7 @@ int nvmf_discover(const char *desc, int argc, char **argv, bool connect)
+ 		hostid = hid = nvmf_hostid_from_file();
+ 	if (!hostid && hostnqn)
+ 		hostid = hid = nvmf_hostid_from_hostnqn(hostnqn);
+-	nvmf_check_hostid_and_hostnqn(hostid, hostnqn);
++	nvmf_check_hostid_and_hostnqn(hostid, hostnqn, verbose);
+ 	h = nvme_lookup_host(r, hostnqn, hostid);
+ 	if (!h) {
+ 		ret = ENOMEM;
+@@ -964,7 +968,7 @@ int nvmf_connect(const char *desc, int argc, char **argv)
+ 		hostid = hid = nvmf_hostid_from_file();
+ 	if (!hostid && hostnqn)
+ 		hostid = hid = nvmf_hostid_from_hostnqn(hostnqn);
+-	nvmf_check_hostid_and_hostnqn(hostid, hostnqn);
++	nvmf_check_hostid_and_hostnqn(hostid, hostnqn, verbose);
+ 	h = nvme_lookup_host(r, hostnqn, hostid);
+ 	if (!h) {
+ 		errno = ENOMEM;
diff --git a/nvme-cli.spec b/nvme-cli.spec
index d5aadb6..02510e1 100644
--- a/nvme-cli.spec
+++ b/nvme-cli.spec
@@ -3,13 +3,16 @@
 
 Name:           nvme-cli
 Version:        2.7.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        NVMe management command line interface
 
 License:        GPL-2.0-only
 URL:            https://github.com/linux-nvme/nvme-cli
 Source0:        %{url}/archive/v%{version_no_tilde}/%{name}-%{version_no_tilde}.tar.gz
 
+# https://github.com/linux-nvme/nvme-cli/pull/2165
+Patch0:         nvme-cli-2.8.0-TP4126-lower_hostnqn_warnings.patch
+
 BuildRequires:  meson >= 0.50.0
 BuildRequires:  gcc gcc-c++
 BuildRequires:  systemd-devel
@@ -78,6 +81,9 @@ rm -rf %{buildroot}%{_pkgdocdir}/nvme
 
 
 %changelog
+* Fri Feb 09 2024 Tomas Bzatek <tbzatek@redhat.com> - 2.7.1-4
+- Lower the verbosity of TP4126 hostnqn-hostid consistency checks
+
 * Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild