nvme/nvme-cli
1
0
Fork 0
Code Issues Activity

Merging upstream version 2.13.

Browse source 
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
Daniel Baumann 2025-04-13 11:50:38 +02:00
parent adb2e5e05d
commit 8599c7290c
Signed by: daniel
GPG key ID: FBB4F0E80A80222F
579 changed files with 6165 additions and 1687 deletions
Download patch file Download diff file Expand all files Collapse all files

33
nvme-print-stdout.c
View file

@ -1112,6 +1112,10 @@ static void stdout_subsys_config(nvme_subsystem_t s)
nvme_host_get_hostnqn(nvme_subsystem_get_host(s)));
if (stdout_print_ops.flags & VERBOSE) {
printf("%*s model=%s\n", len, " ",
nvme_subsystem_get_model(s));
printf("%*s firmware=%s\n", len, " ",
nvme_subsystem_get_fw_rev(s));
printf("%*s iopolicy=%s\n", len, " ",
nvme_subsystem_get_iopolicy(s));
printf("%*s type=%s\n", len, " ",
@ -2913,11 +2917,20 @@ static void stdout_cmd_set_independent_id_ns_nsfeat(__u8 nsfeat)
static void stdout_cmd_set_independent_id_ns_nstat(__u8 nstat)
{
__u8 rsvd1 = (nstat & 0xfe) >> 1;
__u8 rsvd3 = (nstat & 0xf8) >> 3;
__u8 ioi = (nstat & 0x6) >> 1;
__u8 nrdy = nstat & 0x1;
if (rsvd1)
printf(" [7:1] : %#x\tReserved\n", rsvd1);
static const char * const ioi_string[] = {
"I/O performance degradation is not reported",
"Reserved",
"I/O performance is not currently degraded",
"I/O performance is currently degraded"
};
if (rsvd3)
printf(" [7:3] : %#x\tReserved\n", rsvd3);
printf(" [2:1] : %#x\t%s\n", ioi, ioi_string[ioi]);
printf(" [0:0] : %#x\tName space is %sready\n",
nrdy, nrdy ? "" : "not ");
printf("\n");
@ -2951,6 +2964,11 @@ static void stdout_cmd_set_independent_id_ns(struct nvme_id_independent_id_ns *n
printf("nstat : %#x\n", ns->nstat);
if (human)
stdout_cmd_set_independent_id_ns_nstat(ns->nstat);
printf("kpios : %#x\n", ns->kpios);
if (human)
stdout_id_ns_kpios(ns->kpios);
printf("maxkt : %#x\n", le16_to_cpu(ns->maxkt));
printf("rgrpid : %#x\n", le32_to_cpu(ns->rgrpid));
}
static void stdout_id_ns_descs(void *data, unsigned int nsid)
@ -5604,9 +5622,14 @@ static void stdout_message(bool error, const char *msg, va_list ap)
fprintf(error ? stderr : stdout, "\n");
}
static void stdout_perror(const char *msg)
static void stdout_perror(const char *msg, va_list ap)
{
perror(msg);
_cleanup_free_ char *error = NULL;
if (vasprintf(&error, msg, ap) < 0)
error = alloc_error;
perror(error);
}
static void stdout_discovery_log(struct nvmf_discovery_log *log, int numrec)