Merge branch 'master' into next

[mirror_iproute2.git] / rdma / utils.c

diff --git a/rdma/utils.c b/rdma/utils.c
index 95b669f39e307d0c0fb8e731ddb0e5eb92262cce..e25c3adfb80258dfefc9a1c8069b3b46e91e0d2a 100644 (file)
--- a/rdma/utils.c
+++ b/rdma/utils.c
@@ -449,6 +449,7 @@ static const enum mnl_attr_data_type nldev_policy[RDMA_NLDEV_ATTR_MAX] = {
        [RDMA_NLDEV_ATTR_STAT_MODE] = MNL_TYPE_U32,
        [RDMA_NLDEV_ATTR_STAT_RES] = MNL_TYPE_U32,
        [RDMA_NLDEV_ATTR_STAT_AUTO_MODE_MASK] = MNL_TYPE_U32,
+       [RDMA_NLDEV_ATTR_DEV_DIM] = MNL_TYPE_U8,
 };
 
 int rd_attr_check(const struct nlattr *attr, int *typep)
@@ -547,8 +548,7 @@ int rd_exec_link(struct rd *rd, int (*cb)(struct rd *rd), bool strict_port)
        uint32_t port;
        int ret = 0;
 
-       if (rd->json_output)
-               jsonw_start_array(rd->jw);
+       new_json_obj(rd->json_output);
        if (rd_no_arg(rd)) {
                list_for_each_entry(dev_map, &rd->dev_map_list, list) {
                        rd->dev_idx = dev_map->idx;
@@ -588,8 +588,7 @@ int rd_exec_link(struct rd *rd, int (*cb)(struct rd *rd), bool strict_port)
        }
 
 out:
-       if (rd->json_output)
-               jsonw_end_array(rd->jw);
+       delete_json_obj();
        return ret;
 }
 
@@ -598,8 +597,7 @@ int rd_exec_dev(struct rd *rd, int (*cb)(struct rd *rd))
        struct dev_map *dev_map;
        int ret = 0;
 
-       if (rd->json_output)
-               jsonw_start_array(rd->jw);
+       new_json_obj(rd->json_output);
        if (rd_no_arg(rd)) {
                list_for_each_entry(dev_map, &rd->dev_map_list, list) {
                        rd->dev_idx = dev_map->idx;
@@ -619,8 +617,7 @@ int rd_exec_dev(struct rd *rd, int (*cb)(struct rd *rd))
                ret = cb(rd);
        }
 out:
-       if (rd->json_output)
-               jsonw_end_array(rd->jw);
+       delete_json_obj();
        return ret;
 }
 
@@ -765,96 +762,95 @@ struct dev_map *dev_map_lookup(struct rd *rd, bool allow_port_index)
 
 void newline(struct rd *rd)
 {
-       if (rd->json_output)
-               jsonw_end_array(rd->jw);
-       else
-               pr_out("\n");
+       close_json_object();
+       print_color_string(PRINT_FP, COLOR_NONE, NULL, "\n", NULL);
 }
 
 void newline_indent(struct rd *rd)
 {
        newline(rd);
-       if (!rd->json_output)
-               pr_out("    ");
+       print_color_string(PRINT_FP, COLOR_NONE, NULL, "    ", NULL);
 }
 
 static int print_driver_string(struct rd *rd, const char *key_str,
                                 const char *val_str)
 {
-       if (rd->json_output) {
-               jsonw_string_field(rd->jw, key_str, val_str);
-               return 0;
-       } else {
-               return pr_out("%s %s ", key_str, val_str);
-       }
+       print_color_string(PRINT_ANY, COLOR_NONE, key_str, key_str, val_str);
+       print_color_string(PRINT_FP, COLOR_NONE, NULL, " %s ", val_str);
+       return 0;
+}
+
+void print_on_off(struct rd *rd, const char *key_str, bool on)
+{
+       print_driver_string(rd, key_str, (on) ? "on":"off");
 }
 
 static int print_driver_s32(struct rd *rd, const char *key_str, int32_t val,
                              enum rdma_nldev_print_type print_type)
 {
-       if (rd->json_output) {
-               jsonw_int_field(rd->jw, key_str, val);
-               return 0;
-       }
-       switch (print_type) {
-       case RDMA_NLDEV_PRINT_TYPE_UNSPEC:
-               return pr_out("%s %d ", key_str, val);
-       case RDMA_NLDEV_PRINT_TYPE_HEX:
-               return pr_out("%s 0x%x ", key_str, val);
-       default:
-               return -EINVAL;
+       if (!rd->json_output) {
+               switch (print_type) {
+               case RDMA_NLDEV_PRINT_TYPE_UNSPEC:
+                       return pr_out("%s %d ", key_str, val);
+               case RDMA_NLDEV_PRINT_TYPE_HEX:
+                       return pr_out("%s 0x%x ", key_str, val);
+               default:
+                       return -EINVAL;
+               }
        }
+       print_color_int(PRINT_JSON, COLOR_NONE, key_str, NULL, val);
+       return 0;
 }
 
 static int print_driver_u32(struct rd *rd, const char *key_str, uint32_t val,
                              enum rdma_nldev_print_type print_type)
 {
-       if (rd->json_output) {
-               jsonw_int_field(rd->jw, key_str, val);
-               return 0;
-       }
-       switch (print_type) {
-       case RDMA_NLDEV_PRINT_TYPE_UNSPEC:
-               return pr_out("%s %u ", key_str, val);
-       case RDMA_NLDEV_PRINT_TYPE_HEX:
-               return pr_out("%s 0x%x ", key_str, val);
-       default:
-               return -EINVAL;
+       if (!rd->json_output) {
+               switch (print_type) {
+               case RDMA_NLDEV_PRINT_TYPE_UNSPEC:
+                       return pr_out("%s %u ", key_str, val);
+               case RDMA_NLDEV_PRINT_TYPE_HEX:
+                       return pr_out("%s 0x%x ", key_str, val);
+               default:
+                       return -EINVAL;
+               }
        }
+       print_color_int(PRINT_JSON, COLOR_NONE, key_str, NULL, val);
+       return 0;
 }
 
 static int print_driver_s64(struct rd *rd, const char *key_str, int64_t val,
                              enum rdma_nldev_print_type print_type)
 {
-       if (rd->json_output) {
-               jsonw_int_field(rd->jw, key_str, val);
-               return 0;
-       }
-       switch (print_type) {
-       case RDMA_NLDEV_PRINT_TYPE_UNSPEC:
-               return pr_out("%s %" PRId64 " ", key_str, val);
-       case RDMA_NLDEV_PRINT_TYPE_HEX:
-               return pr_out("%s 0x%" PRIx64 " ", key_str, val);
-       default:
-               return -EINVAL;
+       if (!rd->json_output) {
+               switch (print_type) {
+               case RDMA_NLDEV_PRINT_TYPE_UNSPEC:
+                       return pr_out("%s %" PRId64 " ", key_str, val);
+               case RDMA_NLDEV_PRINT_TYPE_HEX:
+                       return pr_out("%s 0x%" PRIx64 " ", key_str, val);
+               default:
+                       return -EINVAL;
+               }
        }
+       print_color_int(PRINT_JSON, COLOR_NONE, key_str, NULL, val);
+       return 0;
 }
 
 static int print_driver_u64(struct rd *rd, const char *key_str, uint64_t val,
                              enum rdma_nldev_print_type print_type)
 {
-       if (rd->json_output) {
-               jsonw_int_field(rd->jw, key_str, val);
-               return 0;
-       }
-       switch (print_type) {
-       case RDMA_NLDEV_PRINT_TYPE_UNSPEC:
-               return pr_out("%s %" PRIu64 " ", key_str, val);
-       case RDMA_NLDEV_PRINT_TYPE_HEX:
-               return pr_out("%s 0x%" PRIx64 " ", key_str, val);
-       default:
-               return -EINVAL;
+       if (!rd->json_output) {
+               switch (print_type) {
+               case RDMA_NLDEV_PRINT_TYPE_UNSPEC:
+                       return pr_out("%s %" PRIu64 " ", key_str, val);
+               case RDMA_NLDEV_PRINT_TYPE_HEX:
+                       return pr_out("%s 0x%" PRIx64 " ", key_str, val);
+               default:
+                       return -EINVAL;
+               }
        }
+       print_color_int(PRINT_JSON, COLOR_NONE, key_str, NULL, val);
+       return 0;
 }
 
 static int print_driver_entry(struct rd *rd, struct nlattr *key_attr,