[aarch64] Fixes CLI crashes on dpaa2 platform.
- always use 'va_args' as pointer in all format_* functions
- u32 for all 'indent' params as it's declaration was inconsistent
Change-Id: Ic5799309a6b104c9b50fec309cba789c8da99e79
Signed-off-by: Christophe Fontaine <christophe.fontaine@enea.com>
diff --git a/src/vnet/devices/af_packet/node.c b/src/vnet/devices/af_packet/node.c
index 5301ad2..ec7c273 100644
--- a/src/vnet/devices/af_packet/node.c
+++ b/src/vnet/devices/af_packet/node.c
@@ -58,7 +58,7 @@
CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
af_packet_input_trace_t *t = va_arg (*args, af_packet_input_trace_t *);
- uword indent = format_get_indent (s);
+ u32 indent = format_get_indent (s);
s = format (s, "af_packet: hw_if_index %d next-index %d",
t->hw_if_index, t->next_index);
diff --git a/src/vnet/devices/netmap/device.c b/src/vnet/devices/netmap/device.c
index aea9ddf..e39888f 100644
--- a/src/vnet/devices/netmap/device.c
+++ b/src/vnet/devices/netmap/device.c
@@ -63,7 +63,7 @@
int verbose = va_arg (*args, int);
netmap_main_t *nm = &netmap_main;
netmap_if_t *nif = vec_elt_at_index (nm->interfaces, dev_instance);
- uword indent = format_get_indent (s);
+ u32 indent = format_get_indent (s);
s = format (s, "NETMAP interface");
if (verbose)
diff --git a/src/vnet/devices/netmap/node.c b/src/vnet/devices/netmap/node.c
index e120eea..67ddce5 100644
--- a/src/vnet/devices/netmap/node.c
+++ b/src/vnet/devices/netmap/node.c
@@ -57,7 +57,7 @@
CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
netmap_input_trace_t *t = va_arg (*args, netmap_input_trace_t *);
- uword indent = format_get_indent (s);
+ u32 indent = format_get_indent (s);
s = format (s, "netmap: hw_if_index %d next-index %d",
t->hw_if_index, t->next_index);
diff --git a/src/vnet/devices/virtio/vhost-user.c b/src/vnet/devices/virtio/vhost-user.c
index 4200ed8..ca54f11 100644
--- a/src/vnet/devices/virtio/vhost-user.c
+++ b/src/vnet/devices/virtio/vhost-user.c
@@ -1257,7 +1257,7 @@
vnet_sw_interface_t *sw = vnet_get_sw_interface (vnm, vui->sw_if_index);
- uword indent = format_get_indent (s);
+ u32 indent = format_get_indent (s);
s = format (s, "%U %U queue %d\n", format_white_space, indent,
format_vnet_sw_interface_name, vnm, sw, t->qid);