Skip to content
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

types: Rename nvme_cmd_get_log_telemetry_host_lsp to nvme_log_telemet… #663

Closed
wants to merge 2 commits into from
Closed

types: Rename nvme_cmd_get_log_telemetry_host_lsp to nvme_log_telemet… #663

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9117ecf
types: Rename nvme_cmd_get_log_telemetry_host_lsp to nvme_log_telemet…
ikegami-t Jun 17, 2023
5da13c7
types: Renamve nvme_cmd_get_log_lid to nvme_log_lid
ikegami-t Jun 17, 2023
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
4 changes: 2 additions & 2 deletions src/nvme/api-types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ struct nvme_identify_args {
* @args_size: Length of the structure
* @fd: File descriptor of nvme device
* @timeout: Timeout in ms
* @lid: Log page identifier, see &enum nvme_cmd_get_log_lid for known
* @lid: Log page identifier, see &enum nvme_log_lid for known
* values
* @len: Length of provided user buffer to hold the log data in bytes
* @nsid: Namespace identifier, if applicable
Expand All @@ -81,7 +81,7 @@ struct nvme_get_log_args {
int args_size;
int fd;
__u32 timeout;
enum nvme_cmd_get_log_lid lid;
enum nvme_log_lid lid;
__u32 len;
__u32 nsid;
enum nvme_csi csi;
Expand Down
4 changes: 2 additions & 2 deletions src/nvme/ioctl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1244,7 +1244,7 @@ int nvme_get_log(struct nvme_get_log_args *args);
int nvme_get_log_page(int fd, __u32 xfer_len, struct nvme_get_log_args *args);

static inline int nvme_get_nsid_log(int fd, bool rae,
enum nvme_cmd_get_log_lid lid,
enum nvme_log_lid lid,
__u32 nsid, __u32 len, void *log)
{
struct nvme_get_log_args args = {
Expand All @@ -1268,7 +1268,7 @@ static inline int nvme_get_nsid_log(int fd, bool rae,
return nvme_get_log_page(fd, NVME_LOG_PAGE_PDU_SIZE, &args);
}

static inline int nvme_get_log_simple(int fd, enum nvme_cmd_get_log_lid lid,
static inline int nvme_get_log_simple(int fd, enum nvme_log_lid lid,
__u32 len, void *log)
{
return nvme_get_nsid_log(fd, false, lid, NVME_NSID_ALL, len, log);
Expand Down
2 changes: 1 addition & 1 deletion src/nvme/linux.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ static int nvme_get_telemetry_log(int fd, bool create, bool ctrl, bool rae,
static const __u32 xfer = NVME_LOG_TELEM_BLOCK_SIZE;

struct nvme_telemetry_log *telem;
enum nvme_cmd_get_log_lid lid;
enum nvme_log_lid lid;
struct nvme_id_ctrl id_ctrl;
void *log, *tmp;
int err;
Expand Down
4 changes: 2 additions & 2 deletions src/nvme/mi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1491,7 +1491,7 @@ int nvme_mi_admin_get_log(nvme_mi_ctrl_t ctrl, struct nvme_get_log_args *args);
* &enum nvme_status_field) or -1 with errno set otherwise.
*/
static inline int nvme_mi_admin_get_nsid_log(nvme_mi_ctrl_t ctrl, bool rae,
enum nvme_cmd_get_log_lid lid,
enum nvme_log_lid lid,
__u32 nsid, __u32 len, void *log)
{
struct nvme_get_log_args args = {
Expand Down Expand Up @@ -1528,7 +1528,7 @@ static inline int nvme_mi_admin_get_nsid_log(nvme_mi_ctrl_t ctrl, bool rae,
* &enum nvme_status_field) or -1 with errno set otherwise.
*/
static inline int nvme_mi_admin_get_log_simple(nvme_mi_ctrl_t ctrl,
enum nvme_cmd_get_log_lid lid,
enum nvme_log_lid lid,
__u32 len, void *log)
{
return nvme_mi_admin_get_nsid_log(ctrl, false, lid, NVME_NSID_ALL,
Expand Down
8 changes: 4 additions & 4 deletions src/nvme/types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3007,11 +3007,11 @@ struct nvme_self_test_log {
} __attribute__((packed));

/**
* enum nvme_cmd_get_log_telemetry_host_lsp - Telemetry Host-Initiated log specific field
* enum nvme_log_telemetry_host_lsp - Telemetry Host-Initiated log specific field
* @NVME_LOG_TELEM_HOST_LSP_RETAIN: Get Telemetry Data Blocks
* @NVME_LOG_TELEM_HOST_LSP_CREATE: Create Telemetry Data Blocks
*/
enum nvme_cmd_get_log_telemetry_host_lsp {
enum nvme_log_telemetry_host_lsp {
NVME_LOG_TELEM_HOST_LSP_RETAIN = 0,
NVME_LOG_TELEM_HOST_LSP_CREATE = 1,
};
Expand Down Expand Up @@ -6666,7 +6666,7 @@ enum nvme_identify_cns {
};

/**
* enum nvme_cmd_get_log_lid - Get Log Page -Log Page Identifiers
* enum nvme_log_lid - Get Log Page -Log Page Identifiers
* @NVME_LOG_LID_SUPPORTED_LOG_PAGES: Supported Log Pages
* @NVME_LOG_LID_ERROR: Error Information
* @NVME_LOG_LID_SMART: SMART / Health Information
Expand Down Expand Up @@ -6697,7 +6697,7 @@ enum nvme_identify_cns {
* @NVME_LOG_LID_SANITIZE: Sanitize Status
* @NVME_LOG_LID_ZNS_CHANGED_ZONES: Changed Zone List
*/
enum nvme_cmd_get_log_lid {
enum nvme_log_lid {
NVME_LOG_LID_SUPPORTED_LOG_PAGES = 0x00,
NVME_LOG_LID_ERROR = 0x01,
NVME_LOG_LID_SMART = 0x02,
Expand Down