From: Nilay Shroff <nilay@linux.ibm.com>
To: linux-nvme@lists.infradead.org
Cc: kbusch@kernel.org, dwagner@suse.de, gjoyce@ibm.com, nilay@linux.ibm.com
Subject: [PATCH nvme-cli] nvme-print: Print cntlid number for controller
Date: Fri, 5 Apr 2024 17:40:36 +0530 [thread overview]
Message-ID: <20240405121057.297071-1-nilay@linux.ibm.com> (raw)
Print the controller identifier number (cntlid) for the
nvme controller. The cntlid is printed if nvme list
verbose is specified.
Link: https://lore.kernel.org/all/20240326065752.164286-1-nilay@linux.ibm.com/
Signed-off-by: Nilay Shroff <nilay@linux.ibm.com>
---
nvme-print-json.c | 1 +
nvme-print-stdout.c | 12 +++++++-----
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/nvme-print-json.c b/nvme-print-json.c
index fec72b9d..8cf057f2 100644
--- a/nvme-print-json.c
+++ b/nvme-print-json.c
@@ -3899,6 +3899,7 @@ static void json_detail_list(nvme_root_t t)
struct json_object *jpaths = json_create_array();
obj_add_str(jctrl, "Controller", nvme_ctrl_get_name(c));
+ obj_add_str(jctrl, "Cntlid", nvme_ctrl_get_cntlid(c));
obj_add_str(jctrl, "SerialNumber", nvme_ctrl_get_serial(c));
obj_add_str(jctrl, "ModelNumber", nvme_ctrl_get_model(c));
obj_add_str(jctrl, "Firmware", nvme_ctrl_get_firmware(c));
diff --git a/nvme-print-stdout.c b/nvme-print-stdout.c
index 795087ee..1b62a8e4 100644
--- a/nvme-print-stdout.c
+++ b/nvme-print-stdout.c
@@ -4802,8 +4802,9 @@ static bool stdout_detailed_ctrl(const char *name, void *arg)
c = htable_ctrl_get(&res->ht_c, name);
assert(c);
- printf("%-8s %-20s %-40s %-8s %-6s %-14s %-6s %-12s ",
+ printf("%-8s %-6s %-20s %-40s %-8s %-6s %-14s %-6s %-12s ",
nvme_ctrl_get_name(c),
+ nvme_ctrl_get_cntlid(c),
nvme_ctrl_get_serial(c),
nvme_ctrl_get_model(c),
nvme_ctrl_get_firmware(c),
@@ -4882,10 +4883,11 @@ static void stdout_detailed_list(nvme_root_t r)
strset_iterate(&res.subsystems, stdout_detailed_subsys, &res);
printf("\n");
- printf("%-8s %-20s %-40s %-8s %-6s %-14s %-6s %-12s %-16s\n", "Device",
- "SN", "MN", "FR", "TxPort", "Address", "Slot", "Subsystem", "Namespaces");
- printf("%-.8s %-.20s %-.40s %-.8s %-.6s %-.14s %-.6s %-.12s %-.16s\n", dash,
- dash, dash, dash, dash, dash, dash, dash, dash);
+ printf("%-8s %-6s %-20s %-40s %-8s %-6s %-14s %-6s %-12s %-16s\n", "Device",
+ "Cntlid", "SN", "MN", "FR", "TxPort", "Address", "Slot", "Subsystem",
+ "Namespaces");
+ printf("%-.8s %-.6s %-.20s %-.40s %-.8s %-.6s %-.14s %-.6s %-.12s %-.16s\n",
+ dash, dash, dash, dash, dash, dash, dash, dash, dash, dash);
strset_iterate(&res.ctrls, stdout_detailed_ctrl, &res);
printf("\n");
--
2.44.0
next reply other threads:[~2024-04-05 12:11 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-05 12:10 Nilay Shroff [this message]
2024-04-07 21:55 ` [PATCH nvme-cli] nvme-print: Print cntlid number for controller Sagi Grimberg
2024-04-09 10:06 ` Daniel Wagner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240405121057.297071-1-nilay@linux.ibm.com \
--to=nilay@linux.ibm.com \
--cc=dwagner@suse.de \
--cc=gjoyce@ibm.com \
--cc=kbusch@kernel.org \
--cc=linux-nvme@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).