summaryrefslogtreecommitdiff
path: root/devlink
diff options
context:
space:
mode:
authorStephen Hemminger <stephen@networkplumber.org>2022-05-26 17:09:59 -0700
committerStephen Hemminger <stephen@networkplumber.org>2022-05-26 17:09:59 -0700
commitb1521ec002e1d2c72404aa9e4d7734c541260a7c (patch)
tree5174bcbb5f5a80f19328ae69ebae412e8a4c2978 /devlink
parent6474b7c8651368d63968671d75e34e4c7d6c9a20 (diff)
parent8d3977ef8193f976a0905d5ff054869f0d5ebc11 (diff)
downloadiproute2-b1521ec002e1d2c72404aa9e4d7734c541260a7c.tar.gz
Merge git://git.kernel.org/pub/scm/network/iproute2/iproute2-next
Diffstat (limited to 'devlink')
-rw-r--r--devlink/devlink.c19
1 files changed, 13 insertions, 6 deletions
diff --git a/devlink/devlink.c b/devlink/devlink.c
index aab739f7..ddf430bb 100644
--- a/devlink/devlink.c
+++ b/devlink/devlink.c
@@ -367,6 +367,7 @@ struct dl {
bool pretty_output;
bool verbose;
bool stats;
+ bool hex;
struct {
bool present;
char *bus_name;
@@ -8044,6 +8045,8 @@ static int cmd_health_dump_clear(struct dl *dl)
static int fmsg_value_show(struct dl *dl, int type, struct nlattr *nl_data)
{
+ const char *num_fmt = dl->hex ? "%#x" : "%u";
+ const char *num64_fmt = dl->hex ? "%#"PRIx64 : "%"PRIu64;
uint8_t *data;
uint32_t len;
@@ -8053,16 +8056,16 @@ static int fmsg_value_show(struct dl *dl, int type, struct nlattr *nl_data)
print_bool(PRINT_ANY, NULL, "%s", mnl_attr_get_u8(nl_data));
break;
case MNL_TYPE_U8:
- print_uint(PRINT_ANY, NULL, "%u", mnl_attr_get_u8(nl_data));
+ print_uint(PRINT_ANY, NULL, num_fmt, mnl_attr_get_u8(nl_data));
break;
case MNL_TYPE_U16:
- print_uint(PRINT_ANY, NULL, "%u", mnl_attr_get_u16(nl_data));
+ print_uint(PRINT_ANY, NULL, num_fmt, mnl_attr_get_u16(nl_data));
break;
case MNL_TYPE_U32:
- print_uint(PRINT_ANY, NULL, "%u", mnl_attr_get_u32(nl_data));
+ print_uint(PRINT_ANY, NULL, num_fmt, mnl_attr_get_u32(nl_data));
break;
case MNL_TYPE_U64:
- print_u64(PRINT_ANY, NULL, "%"PRIu64, mnl_attr_get_u64(nl_data));
+ print_u64(PRINT_ANY, NULL, num64_fmt, mnl_attr_get_u64(nl_data));
break;
case MNL_TYPE_NUL_STRING:
print_string(PRINT_ANY, NULL, "%s", mnl_attr_get_str(nl_data));
@@ -8939,7 +8942,7 @@ static void help(void)
pr_err("Usage: devlink [ OPTIONS ] OBJECT { COMMAND | help }\n"
" devlink [ -f[orce] ] -b[atch] filename -N[etns] netnsname\n"
"where OBJECT := { dev | port | sb | monitor | dpipe | resource | region | health | trap }\n"
- " OPTIONS := { -V[ersion] | -n[o-nice-names] | -j[son] | -p[retty] | -v[erbose] -s[tatistics] }\n");
+ " OPTIONS := { -V[ersion] | -n[o-nice-names] | -j[son] | -p[retty] | -v[erbose] -s[tatistics] -[he]x }\n");
}
static int dl_cmd(struct dl *dl, int argc, char **argv)
@@ -9053,6 +9056,7 @@ int main(int argc, char **argv)
{ "statistics", no_argument, NULL, 's' },
{ "Netns", required_argument, NULL, 'N' },
{ "iec", no_argument, NULL, 'i' },
+ { "hex", no_argument, NULL, 'x' },
{ NULL, 0, NULL, 0 }
};
const char *batch_file = NULL;
@@ -9068,7 +9072,7 @@ int main(int argc, char **argv)
return EXIT_FAILURE;
}
- while ((opt = getopt_long(argc, argv, "Vfb:njpvsN:i",
+ while ((opt = getopt_long(argc, argv, "Vfb:njpvsN:ix",
long_options, NULL)) >= 0) {
switch (opt) {
@@ -9106,6 +9110,9 @@ int main(int argc, char **argv)
case 'i':
use_iec = true;
break;
+ case 'x':
+ dl->hex = true;
+ break;
default:
pr_err("Unknown option.\n");
help();