Skip to content

libnvme: Rename NVME_LOG_*_DISCOVER to NVME_LOG_*_DISCOVERY #2995

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
martin-belanger wants to merge 1 commit into from
Closed

libnvme: Rename NVME_LOG_*_DISCOVER to NVME_LOG_*_DISCOVERY #2995

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions libnvme/doc/man/nvme_cmd_get_log_lid.2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions libnvme/doc/rst/types.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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``
Expand Down
4 changes: 2 additions & 2 deletions libnvme/examples/discover-loop.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions libnvme/libnvme/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 2 additions & 0 deletions subprojects/openssl.wrap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[wrap-redirect]
filename = libnvme/subprojects/openssl.wrap

Check failure on line 2 in subprojects/openssl.wrap

View workflow job for this annotation

GitHub Actions / checkpatch review 

WARNING: It's generally not useful to have the filename in the file
Loading