libnvme: Rename NVME_LOG_*_DISCOVER to NVME_LOG_*_DISCOVERY

The following 3 types were renamed at some point, but not all
instances were renamed in the docs and python examples.

NVME_LOG_LID_DISCOVER      -> NVME_LOG_LID_DISCOVERY
NVME_LOG_LID_HOST_DISCOVER -> NVME_LOG_LID_HOST_DISCOVERY
NVME_LOG_LID_AVE_DISCOVER  -> NVME_LOG_LID_AVE_DISCOVERY

Signed-off-by: Martin Belanger <[email protected]>

Author: Martin Belanger

libnvme/doc/man/nvme_cmd_get_log_lid.2

@@ -136,15 +136,15 @@ enum nvme_cmd_get_log_lid {
 , 
 .br
 .br
-.BI "    NVME_LOG_LID_DISCOVER"
+.BI "    NVME_LOG_LID_DISCOVERY"
 , 
 .br
 .br
-.BI "    NVME_LOG_LID_HOST_DISCOVER"
+.BI "    NVME_LOG_LID_HOST_DISCOVERY"
 , 
 .br
 .br
-.BI "    NVME_LOG_LID_AVE_DISCOVER"
+.BI "    NVME_LOG_LID_AVE_DISCOVERY"
 , 
 .br
 .br
@@ -230,11 +230,11 @@ Reclaim Unit Handle Usage
 FDP Statistics
 .IP "NVME_LOG_LID_FDP_EVENTS" 12
 FDP Events
-.IP "NVME_LOG_LID_DISCOVER" 12
+.IP "NVME_LOG_LID_DISCOVERY" 12
 Discovery
-.IP "NVME_LOG_LID_HOST_DISCOVER" 12
+.IP "NVME_LOG_LID_HOST_DISCOVERY" 12
 Host Discovery
-.IP "NVME_LOG_LID_AVE_DISCOVER" 12
+.IP "NVME_LOG_LID_AVE_DISCOVERY" 12
 AVE Discovery
 .IP "NVME_LOG_LID_PULL_MODEL_DDC_REQ" 12
 Pull Model DDC Request

libnvme/doc/rst/types.rst

@@ -14036,13 +14036,13 @@ true if **status** is of the specified type and value
 ``NVME_LOG_LID_FDP_EVENTS``
   FDP Events
 
-``NVME_LOG_LID_DISCOVER``
+``NVME_LOG_LID_DISCOVERY``
   Discovery
 
-``NVME_LOG_LID_HOST_DISCOVER``
+``NVME_LOG_LID_HOST_DISCOVERY``
   Host Discovery
 
-``NVME_LOG_LID_AVE_DISCOVER``
+``NVME_LOG_LID_AVE_DISCOVERY``
   AVE Discovery
 
 ``NVME_LOG_LID_PULL_MODEL_DDC_REQ``

libnvme/examples/discover-loop.py

@@ -31,11 +31,11 @@ def discover(host, ctrl, iteration):
 
     slp = ctrl.supported_log_pages()
     try:
-        dlp_supp_opts = slp[nvme.NVME_LOG_LID_DISCOVER] >> 16
+        dlp_supp_opts = slp[nvme.NVME_LOG_LID_DISCOVERY] >> 16
     except (TypeError, IndexError):
         dlp_supp_opts = 0
 
-    print(f"LID {nvme.NVME_LOG_LID_DISCOVER}h (Discovery), supports: {disc_supp_str(dlp_supp_opts)}")
+    print(f"LID {nvme.NVME_LOG_LID_DISCOVERY}h (Discovery), supports: {disc_supp_str(dlp_supp_opts)}")
 
     try:
         lsp = nvme.NVMF_LOG_DISC_LSP_PLEO if dlp_supp_opts & nvme.NVMF_LOG_DISC_LID_PLEOS else 0

libnvme/libnvme/README.md

@@ -42,11 +42,11 @@ except Exception as e:
 supported_log_pages = ctrl.supported_log_pages()
 try:
     # Get the supported options for the Get Discovery Log Page command
-    dlp_supp_opts = supported_log_pages[nvme.NVME_LOG_LID_DISCOVER] >> 16
+    dlp_supp_opts = supported_log_pages[nvme.NVME_LOG_LID_DISCOVERY] >> 16
 except (TypeError, IndexError):
     dlp_supp_opts = 0
 
-print(f"LID {nvme.NVME_LOG_LID_DISCOVER:02x}h (Discovery), supports: {disc_supp_str(dlp_supp_opts)}")
+print(f"LID {nvme.NVME_LOG_LID_DISCOVERY:02x}h (Discovery), supports: {disc_supp_str(dlp_supp_opts)}")
 try:
     lsp = nvme.NVMF_LOG_DISC_LSP_PLEO if dlp_supp_opts & nvme.NVMF_LOG_DISC_LID_PLEOS else 0
     log_pages = ctrl.discover(lsp=lsp)

subprojects/openssl.wrap

@@ -0,0 +1,2 @@
+[wrap-redirect]
+filename = libnvme/subprojects/openssl.wrap