From e533faa72e91ba7d42f7bfd921380d0540f369e8 Mon Sep 17 00:00:00 2001 From: Vladyslav Tarasiuk Date: Sun, 19 Jul 2020 16:36:01 +0300 Subject: [PATCH] devlink: Add a possibility to print arrays of devlink port handles Add a capability of printing port handles for arrays in non-JSON format in devlink-health manner. Signed-off-by: Vladyslav Tarasiuk Reviewed-by: Jiri Pirko Signed-off-by: David Ahern --- devlink/devlink.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/devlink/devlink.c b/devlink/devlink.c index 67681492..bb4588e2 100644 --- a/devlink/devlink.c +++ b/devlink/devlink.c @@ -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); + } } }