Merging upstream version 2.8.
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
60735e10df
commit
2b9f904876
407 changed files with 2341 additions and 926 deletions
|
@ -4227,11 +4227,11 @@ static void stdout_directive_show_fields(__u8 dtype, __u8 doper,
|
|||
(*(field + 32) & 0x4) ? "enabled" : "disabled");
|
||||
printf("\tDirective Persistent Across Controller Level Resets \n");
|
||||
printf("\t\tIdentify Directive : %s\n",
|
||||
(*(field + 32) & 0x1) ? "enabled" : "disabled");
|
||||
(*(field + 64) & 0x1) ? "enabled" : "disabled");
|
||||
printf("\t\tStream Directive : %s\n",
|
||||
(*(field + 32) & 0x2) ? "enabled" : "disabled");
|
||||
(*(field + 64) & 0x2) ? "enabled" : "disabled");
|
||||
printf("\t\tData Placement Directive : %s\n",
|
||||
(*(field + 32) & 0x4) ? "enabled" : "disabled");
|
||||
(*(field + 64) & 0x4) ? "enabled" : "disabled");
|
||||
break;
|
||||
default:
|
||||
fprintf(stderr,
|
||||
|
@ -4864,7 +4864,7 @@ static void stdout_detailed_list(nvme_root_t r)
|
|||
printf("\n");
|
||||
|
||||
printf("%-8s %-20s %-40s %-8s %-6s %-14s %-6s %-12s %-16s\n", "Device",
|
||||
"SN", "MN", "FR", "TxPort", "Asdress", "Slot", "Subsystem", "Namespaces");
|
||||
"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);
|
||||
strset_iterate(&res.ctrls, stdout_detailed_ctrl, &res);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue