nvme: add iopolicy field in JSON output

Commit d0b4c6c (“nvme: extend show-topology command to add
support for multipath”) extended the show-topology command output
and added the iopolicy field to the subsystem header in the text
output even when show-topology command is executed in non-verbose
mode.

However, the iopolicy field was not included in the JSON output,
(for non-verbose output) resulting in an inconsistency between the
text and JSON formats. This change fixes that by adding the iopolicy
field to the JSON output when the show-topology command is executed
with the JSON output format.

Fixes: d0b4c6c ("nvme: extend show-topology command to add support for multipath")
Signed-off-by: Nilay Shroff <[email protected]>
Reviewed-by: Martin George <[email protected]>
Reviewed-by: Chaitanya Kulkarni <[email protected]>
Link: https://patch.msgid.link/[email protected]
Signed-off-by: Daniel Wagner <[email protected]>

Author: shroffni

nvme-print-json.c

@@ -4851,6 +4851,8 @@ static void json_simple_topology(struct nvme_global_ctx *ctx)
 			subsystem_attrs = json_create_object();
 			obj_add_str(subsystem_attrs, "Name", nvme_subsystem_get_name(s));
 			obj_add_str(subsystem_attrs, "NQN", nvme_subsystem_get_nqn(s));
+			obj_add_str(subsystem_attrs, "IOPolicy",
+					nvme_subsystem_get_iopolicy(s));
 
 			if (verbose_mode()) {
 				obj_add_str(subsystem_attrs, "Model",
@@ -4859,8 +4861,6 @@ static void json_simple_topology(struct nvme_global_ctx *ctx)
 						nvme_subsystem_get_serial(s));
 				obj_add_str(subsystem_attrs, "Firmware",
 						nvme_subsystem_get_fw_rev(s));
-				obj_add_str(subsystem_attrs, "IOPolicy",
-						nvme_subsystem_get_iopolicy(s));
 				obj_add_str(subsystem_attrs, "Type",
 						nvme_subsystem_get_type(s));
 			}