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 <hare@suse.de>

diff --git a/libnvme/nvme.i b/libnvme/nvme.i
index cfab8a2a41da5c70dcbc3fb49481d31d3ee13d17..2572e930a69d1ae5ab2ae1eab7862f171d7f78de 100644 (file)
--- 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 64ba10d41eb90e722ed2ec6bb2730e276524c2cc..79239ab550541e4765ef672dc6deff556f4ddfcb 100644 (file)
--- 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 88d19f900c28155daa1c02d04d6407a9356573b0..023e3f318574163226dce4bfe1fe702708eb211d 100644 (file)
--- 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"