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

Merging upstream version 2.6.

Browse source 
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
Daniel Baumann 2025-02-16 12:24:54 +01:00
parent 52cbdbff70
commit 407776cd14
Signed by: daniel
GPG key ID: FBB4F0E80A80222F
262 changed files with 7434 additions and 3024 deletions
Download patch file Download diff file Expand all files Collapse all files

18
nvme-print.c
View file

@ -258,6 +258,12 @@ void nvme_show_boot_part_log(void *bp_log, const char *devname,
nvme_print(boot_part_log, flags, bp_log, devname, size);
}
void nvme_show_phy_rx_eom_log(struct nvme_phy_rx_eom_log *log, __u16 controller,
enum nvme_print_flags flags)
{
nvme_print(phy_rx_eom_log, flags, log, controller);
}
void nvme_show_media_unit_stat_log(struct nvme_media_unit_stat_log *mus_log,
enum nvme_print_flags flags)
{
@ -420,7 +426,7 @@ void nvme_show_status(int status)
{
struct print_ops *ops;
if (argconfig_output_format_json(false))
if (nvme_is_output_format_json())
ops = nvme_print_ops(JSON);
else
ops =nvme_print_ops(0);
@ -1016,7 +1022,11 @@ void nvme_show_topology(nvme_root_t r,
enum nvme_cli_topo_ranking ranking,
enum nvme_print_flags flags)
{
nvme_print(topology_namespace, flags, r);
if (ranking == NVME_CLI_TOPO_NAMESPACE) {
nvme_print(topology_namespace, flags, r);
} else {
nvme_print(topology_ctrl, flags, r);
}
}
void nvme_show_message(bool error, const char *msg, ...)
@ -1025,7 +1035,7 @@ void nvme_show_message(bool error, const char *msg, ...)
va_list ap;
va_start(ap, msg);
if (argconfig_output_format_json(false))
if (nvme_is_output_format_json())
ops = nvme_print_ops(JSON);
else
ops = nvme_print_ops(0);
@ -1044,7 +1054,7 @@ void nvme_show_perror(const char *msg)
{
struct print_ops *ops;
if (argconfig_output_format_json(false))
if (nvme_is_output_format_json())
ops = nvme_print_ops(JSON);
else
ops = nvme_print_ops(0);