Skip to content

Commit b32a79c

Browse files
sberbzigaw
authored andcommitted
nvme-print: expand the maximum field length to prevent misalignment
Fields like Generic and Device are longer for SPDK-controlled devices, which causes misalignment. Signed-off-by: Sebastian Brzezinka <sebastian.brzezinka@intel.com> Signed-off-by: Daniel Wagner <dwagner@suse.de>
1 parent 38d6868 commit b32a79c

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

nvme-print-stdout.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -4870,17 +4870,17 @@ static void stdout_detailed_list(nvme_root_t r)
48704870
strset_iterate(&res.subsystems, stdout_detailed_subsys, &res);
48714871
printf("\n");
48724872

4873-
printf("%-8s %-6s %-20s %-40s %-8s %-6s %-14s %-6s %-12s %-16s\n", "Device",
4873+
printf("%-16s %-5s %-20s %-40s %-8s %-6s %-14s %-6s %-12s %-16s\n", "Device",
48744874
"Cntlid", "SN", "MN", "FR", "TxPort", "Address", "Slot", "Subsystem",
48754875
"Namespaces");
4876-
printf("%-.8s %-.6s %-.20s %-.40s %-.8s %-.6s %-.14s %-.6s %-.12s %-.16s\n",
4876+
printf("%-.16s %-.6s %-.20s %-.40s %-.8s %-.6s %-.14s %-.6s %-.12s %-.16s\n",
48774877
dash, dash, dash, dash, dash, dash, dash, dash, dash, dash);
48784878
strset_iterate(&res.ctrls, stdout_detailed_ctrl, &res);
48794879
printf("\n");
48804880

4881-
printf("%-12s %-12s %-10s %-26s %-16s %-16s\n", "Device", "Generic",
4881+
printf("%-17s %-17s %-10s %-26s %-16s %-16s\n", "Device", "Generic",
48824882
"NSID", "Usage", "Format", "Controllers");
4883-
printf("%-.12s %-.12s %-.10s %-.26s %-.16s %-.16s\n", dash, dash, dash,
4883+
printf("%-.17s %-.17s %-.10s %-.26s %-.16s %-.16s\n", dash, dash, dash,
48844884
dash, dash, dash);
48854885
strset_iterate(&res.namespaces, stdout_detailed_ns, &res);
48864886

0 commit comments

Comments
 (0)