]> git.proxmox.com Git - mirror_iproute2.git/commitdiff
devlink: Add a possibility to print arrays of devlink port handles
authorVladyslav Tarasiuk <vladyslavt@mellanox.com>
Sun, 19 Jul 2020 13:36:01 +0000 (16:36 +0300)
committerDavid Ahern <dsahern@kernel.org>
Thu, 23 Jul 2020 00:32:26 +0000 (00:32 +0000)
Add a capability of printing port handles for arrays in non-JSON format
in devlink-health manner.

Signed-off-by: Vladyslav Tarasiuk <vladyslavt@mellanox.com>
Reviewed-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David Ahern <dsahern@kernel.org>
devlink/devlink.c

index 67681492f2b4e5bfcfcd3654fd1cf7e128f0b111..bb4588e22f14d9f26a98884750701bdf05cfc49d 100644 (file)
@@ -2112,7 +2112,19 @@ static void __pr_out_port_handle_start(struct dl *dl, const char *bus_name,
                        open_json_object(buf);
                }
        } else {
-               pr_out("%s:", buf);
+               if (array) {
+                       if (should_arr_last_port_handle_end(dl, bus_name, dev_name, port_index))
+                               __pr_out_indent_dec();
+                       if (should_arr_last_port_handle_start(dl, bus_name,
+                                                             dev_name, port_index)) {
+                               pr_out("%s:", buf);
+                               __pr_out_newline();
+                               __pr_out_indent_inc();
+                               arr_last_port_handle_set(dl, bus_name, dev_name, port_index);
+                       }
+               } else {
+                       pr_out("%s:", buf);
+               }
        }
 }