From 0d2daaacf08d0cd38a9ed12a3fbd7795bea06a3f Mon Sep 17 00:00:00 2001 From: Hannes Reinecke Date: Thu, 12 Aug 2021 13:23:13 +0200 Subject: [PATCH] fabrics: decode new discovery log entry type '3' TP8014 adds a new discovery log entry type '3' to describe the current discovery controller. Signed-off-by: Hannes Reinecke --- libnvme/nvme.i | 5 ++++- src/nvme/fabrics.c | 4 +++- src/nvme/types.h | 2 ++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/libnvme/nvme.i b/libnvme/nvme.i index cfab8a2a..2572e930 100644 --- a/libnvme/nvme.i +++ b/libnvme/nvme.i @@ -219,11 +219,14 @@ static int discover_err = 0; PyDict_SetItemString(entry, "subnqn", val); switch (e->subtype) { case NVME_NQN_DISC: - val = PyUnicode_FromString("discovery"); + val = PyUnicode_FromString("referral"); break; case NVME_NQN_NVME: val = PyUnicode_FromString("nvme"); break; + case NVME_NQN_CURR: + val = PyUnicode_FromString("discovery"); + break; default: val = PyLong_FromLong(e->subtype); } diff --git a/src/nvme/fabrics.c b/src/nvme/fabrics.c index 64ba10d4..79239ab5 100644 --- a/src/nvme/fabrics.c +++ b/src/nvme/fabrics.c @@ -77,8 +77,9 @@ const char *nvmf_adrfam_str(__u8 adrfam) } static const char * const subtypes[] = { - [NVME_NQN_DISC] = "discovery subsystem", + [NVME_NQN_DISC] = "discovery subsystem referral", [NVME_NQN_NVME] = "nvme subsystem", + [NVME_NQN_CURR] = "current discovery subsystem", }; const char *nvmf_subtype_str(__u8 subtype) @@ -571,6 +572,7 @@ nvme_ctrl_t nvmf_connect_disc_entry(nvme_host_t h, switch (e->subtype) { case NVME_NQN_DISC: + case NVME_NQN_CURR: if (discover) *discover = true; break; diff --git a/src/nvme/types.h b/src/nvme/types.h index 88d19f90..023e3f31 100644 --- a/src/nvme/types.h +++ b/src/nvme/types.h @@ -3831,10 +3831,12 @@ enum nvme_ae_info_notice { * enum nvme_subsys_type - * @NVME_NQN_DISC: Discovery type target subsystem * @NVME_NQN_NVME: NVME type target subsystem + * @NVME_NQN_CURR: Current Discovery type target subsystem */ enum nvme_subsys_type { NVME_NQN_DISC = 1, NVME_NQN_NVME = 2, + NVME_NQN_CURR = 3, }; #define NVME_DISC_SUBSYS_NAME "nqn.2014-08.org.nvmexpress.discovery" -- 2.50.1