nvme: add output-format-version option

The JSON outputs changed to verbose by the format version 2.

Signed-off-by: Tokunori Ikegami <[email protected]>

Author: ikegami-t

nvme-print-json.c

@@ -199,7 +199,7 @@ static void json_id_iocs_iocsc(struct json_object *obj_iocsc, __u64 iocsc)
 
 static bool human(void)
 {
-	return json_print_ops.flags & VERBOSE;
+	return json_print_ops.flags & VERBOSE || nvme_cfg.output_format_ver == 2;
 }
 
 static void json_id_iocs(struct nvme_id_iocs *iocs)
@@ -2540,7 +2540,7 @@ static void json_print_nvme_subsystem_list(nvme_root_t r, bool show_ana)
 			obj_add_str(subsystem_attrs, "Name", nvme_subsystem_get_name(s));
 			obj_add_str(subsystem_attrs, "NQN", nvme_subsystem_get_nqn(s));
 
-			if (json_print_ops.flags & VERBOSE) {
+			if (human()) {
 				obj_add_str(subsystem_attrs, "Model",
 						nvme_subsystem_get_model(s));
 				obj_add_str(subsystem_attrs, "Firmware",
@@ -2995,14 +2995,13 @@ static void json_ctrl_register_human(int offset, uint64_t value, struct json_obj
 
 static void json_ctrl_register(int offset, uint64_t value)
 {
-	bool human = json_print_ops.flags & VERBOSE;
 	struct json_object *r;
 	char json_str[STR_LEN];
 
 	sprintf(json_str, "register: %#04x", offset);
 	r = obj_create(json_str);
 
-	if (human) {
+	if (human()) {
 		obj_add_uint64(r, nvme_register_to_string(offset), value);
 		json_ctrl_register_human(offset, value, r);
 	} else {
@@ -3130,7 +3129,7 @@ static void json_nvme_id_ctrl_nvm(struct nvme_id_ctrl_nvm *ctrl_nvm)
 	obj_add_uint(r, "wzdsl", ctrl_nvm->wzdsl);
 	obj_add_uint(r, "aocs", le16_to_cpu(ctrl_nvm->aocs));
 
-	if (json_print_ops.flags & VERBOSE) {
+	if (human()) {
 		__u16 rsvd = (ctrl_nvm->aocs & 0xfffe) >> 1;
 		__u8 ralbas = ctrl_nvm->aocs & 0x1;
 
@@ -4475,7 +4474,7 @@ static void json_list_item(nvme_ns_t n)
 
 static void json_print_list_items(nvme_root_t t)
 {
-	if (json_print_ops.flags & VERBOSE)
+	if (human())
 		json_detail_list(t);
 	else
 		json_simple_list(t);
@@ -4572,7 +4571,7 @@ static void json_simple_topology(nvme_root_t r)
 			obj_add_str(subsystem_attrs, "Name", nvme_subsystem_get_name(s));
 			obj_add_str(subsystem_attrs, "NQN", nvme_subsystem_get_nqn(s));
 
-			if (json_print_ops.flags & VERBOSE) {
+			if (human()) {
 				obj_add_str(subsystem_attrs, "Model",
 						nvme_subsystem_get_model(s));
 				obj_add_str(subsystem_attrs, "Firmware",
@@ -4710,7 +4709,7 @@ static void json_directive_show(__u8 type, __u8 oper, __u16 spec, __u32 nsid, __
 	sprintf(json_str, "%#x", result);
 	obj_add_result(r, json_str);
 
-	if (json_print_ops.flags & VERBOSE) {
+	if (human()) {
 		json_directive_show_fields(type, oper, result, buf, r);
 	} else if (buf) {
 		data = json_create_array();

nvme.c

@@ -258,6 +258,7 @@ static const char *pmrmscu = "PMRMSCU=0xe18 register offset";
 
 struct nvme_config nvme_cfg = {
 	.output_format = "normal",
+	.output_format_ver = 1,
 };
 
 static void *mmap_registers(struct nvme_dev *dev, bool writable);

nvme.h

@@ -79,6 +79,7 @@ struct nvme_config {
 	int verbose;
 	__u32 timeout;
 	bool dry_run;
+	unsigned int output_format_ver;
 };
 
 /*
@@ -92,6 +93,8 @@ struct nvme_config {
 		##__VA_ARGS__,                                                         \
 		OPT_UINT("timeout",      't', &nvme_cfg.timeout,       timeout),       \
 		OPT_FLAG("dry-run",        0, &nvme_cfg.dry_run,       dry_run),       \
+		OPT_UINT("output-format-version", 0, &nvme_cfg.output_format_ver,      \
+			 "output format version: 1|2"),                                \
 		OPT_END()                                                              \
 	}