[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>

src/plugins/dpdk/device/format.c

@@ -374,7 +374,7 @@ format_dpdk_rss_hf_name (u8 * s, va_list * args)
 {
   u64 bitmap = va_arg (*args, u64);
   int next_split = _line_len;
-  int indent = format_get_indent (s);
+  u32 indent = format_get_indent (s);
 
   if (!bitmap)
     return format (s, "none");
@@ -387,7 +387,7 @@ format_dpdk_rx_offload_caps (u8 * s, va_list * args)
 {
   u32 bitmap = va_arg (*args, u32);
   int next_split = _line_len;
-  int indent = format_get_indent (s);
+  u32 indent = format_get_indent (s);
 
   if (!bitmap)
     return format (s, "none");
@@ -400,7 +400,7 @@ format_dpdk_tx_offload_caps (u8 * s, va_list * args)
 {
   u32 bitmap = va_arg (*args, u32);
   int next_split = _line_len;
-  int indent = format_get_indent (s);
+  u32 indent = format_get_indent (s);
   if (!bitmap)
     return format (s, "none");
 
@@ -415,7 +415,7 @@ format_dpdk_device_errors (u8 * s, va_list * args)
 {
   dpdk_device_t *xd = va_arg (*args, dpdk_device_t *);
   clib_error_t *e;
-  uword indent = format_get_indent (s);
+  u32 indent = format_get_indent (s);
 
   vec_foreach (e, xd->errors)
   {
@@ -431,7 +431,7 @@ format_dpdk_device (u8 * s, va_list * args)
   int verbose = va_arg (*args, int);
   dpdk_main_t *dm = &dpdk_main;
   dpdk_device_t *xd = vec_elt_at_index (dm->devices, dev_instance);
-  uword indent = format_get_indent (s);
+  u32 indent = format_get_indent (s);
   f64 now = vlib_time_now (dm->vlib_main);
   struct rte_eth_dev_info di;
 
@@ -577,7 +577,7 @@ format_dpdk_tx_dma_trace (u8 * s, va_list * va)
   dpdk_tx_dma_trace_t *t = va_arg (*va, dpdk_tx_dma_trace_t *);
   dpdk_main_t *dm = &dpdk_main;
   dpdk_device_t *xd = vec_elt_at_index (dm->devices, t->device_index);
-  uword indent = format_get_indent (s);
+  u32 indent = format_get_indent (s);
   vnet_sw_interface_t *sw = vnet_get_sw_interface (vnm, xd->vlib_sw_if_index);
 
   s = format (s, "%U tx queue %d",
@@ -604,7 +604,7 @@ format_dpdk_rx_dma_trace (u8 * s, va_list * va)
   dpdk_main_t *dm = &dpdk_main;
   dpdk_device_t *xd = vec_elt_at_index (dm->devices, t->device_index);
   format_function_t *f;
-  uword indent = format_get_indent (s);
+  u32 indent = format_get_indent (s);
   vnet_sw_interface_t *sw = vnet_get_sw_interface (vnm, xd->vlib_sw_if_index);
 
   s = format (s, "%U rx queue %d",
@@ -641,7 +641,7 @@ static inline u8 *
 format_dpdk_pkt_types (u8 * s, va_list * va)
 {
   u32 *pkt_types = va_arg (*va, u32 *);
-  uword indent __attribute__ ((unused)) = format_get_indent (s) + 2;
+  u32 indent __attribute__ ((unused)) = format_get_indent (s) + 2;
 
   if (!*pkt_types)
     return s;
@@ -664,7 +664,7 @@ static inline u8 *
 format_dpdk_pkt_offload_flags (u8 * s, va_list * va)
 {
   u64 *ol_flags = va_arg (*va, u64 *);
-  uword indent = format_get_indent (s) + 2;
+  u32 indent = format_get_indent (s) + 2;
 
   if (!*ol_flags)
     return s;
@@ -709,7 +709,7 @@ format_dpdk_rte_mbuf (u8 * s, va_list * va)
 {
   struct rte_mbuf *mb = va_arg (*va, struct rte_mbuf *);
   ethernet_header_t *eth_hdr = va_arg (*va, ethernet_header_t *);
-  uword indent = format_get_indent (s) + 2;
+  u32 indent = format_get_indent (s) + 2;
 
   s = format (s, "PKT MBUF: port %d, nb_segs %d, pkt_len %d"
 	      "\n%Ubuf_len %d, data_len %d, ol_flags 0x%x, data_off %d, phys_addr 0x%x"

src/plugins/flowprobe/node.c

@@ -73,7 +73,7 @@ format_flowprobe_trace (u8 * s, va_list * args)
   CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
   CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
   flowprobe_trace_t *t = va_arg (*args, flowprobe_trace_t *);
-  uword indent = format_get_indent (s);
+  u32 indent = format_get_indent (s);
 
   s = format (s,
 	      "FLOWPROBE[%s]: rx_sw_if_index %d, tx_sw_if_index %d, "

src/plugins/ixge/ixge.c

@@ -448,7 +448,7 @@ format_ixge_rx_from_hw_descriptor (u8 * s, va_list * va)
     va_arg (*va, ixge_rx_from_hw_descriptor_t *);
   u32 s0 = d->status[0], s2 = d->status[2];
   u32 is_ip4, is_ip6, is_ip, is_tcp, is_udp;
-  uword indent = format_get_indent (s);
+  u32 indent = format_get_indent (s);
 
   s = format (s, "%s-owned",
 	      (s2 & IXGE_RX_DESCRIPTOR_STATUS2_IS_OWNED_BY_SOFTWARE) ? "sw" :
@@ -517,7 +517,7 @@ format_ixge_tx_descriptor (u8 * s, va_list * va)
 {
   ixge_tx_descriptor_t *d = va_arg (*va, ixge_tx_descriptor_t *);
   u32 s0 = d->status0, s1 = d->status1;
-  uword indent = format_get_indent (s);
+  u32 indent = format_get_indent (s);
   u32 v;
 
   s = format (s, "buffer 0x%Lx, %d packet bytes, %d bytes this buffer",
@@ -582,7 +582,7 @@ format_ixge_rx_dma_trace (u8 * s, va_list * va)
   ixge_main_t *xm = &ixge_main;
   ixge_device_t *xd = vec_elt_at_index (xm->devices, t->device_index);
   format_function_t *f;
-  uword indent = format_get_indent (s);
+  u32 indent = format_get_indent (s);
 
   {
     vnet_sw_interface_t *sw =
@@ -869,7 +869,7 @@ format_ixge_tx_dma_trace (u8 * s, va_list * va)
   ixge_main_t *xm = &ixge_main;
   ixge_device_t *xd = vec_elt_at_index (xm->devices, t->device_index);
   format_function_t *f;
-  uword indent = format_get_indent (s);
+  u32 indent = format_get_indent (s);
 
   {
     vnet_sw_interface_t *sw =
@@ -2344,7 +2344,7 @@ format_ixge_device (u8 * s, va_list * args)
   ixge_main_t *xm = &ixge_main;
   ixge_device_t *xd = vec_elt_at_index (xm->devices, dev_instance);
   ixge_phy_t *phy = xd->phys + xd->phy_index;
-  uword indent = format_get_indent (s);
+  u32 indent = format_get_indent (s);
 
   ixge_update_counters (xd);
   xd->link_status_at_last_link_change = xd->regs->xge_mac.link_status;

src/plugins/lb/lb.c

@@ -128,7 +128,7 @@ u8 *format_lb_vip_detailed (u8 * s, va_list * args)
 {
   lb_main_t *lbm = &lb_main;
   lb_vip_t *vip = va_arg (*args, lb_vip_t *);
-  uword indent = format_get_indent (s);
+  u32 indent = format_get_indent (s);
 
   s = format(s, "%U %U [%u] %U%s\n"
                    "%U  new_size:%u\n",

src/plugins/memif/cli.c

@@ -194,7 +194,7 @@ format_memif_queue (u8 * s, va_list * args)
   memif_if_t *mif = va_arg (*args, memif_if_t *);
   memif_queue_t *mq = va_arg (*args, memif_queue_t *);
   uword i = va_arg (*args, uword);
-  uword indent = format_get_indent (s);
+  u32 indent = format_get_indent (s);
 
   s = format (s, "%U%s ring %u:\n",
 	      format_white_space, indent,
@@ -218,7 +218,7 @@ format_memif_descriptor (u8 * s, va_list * args)
 {
   memif_if_t *mif = va_arg (*args, memif_if_t *);
   memif_queue_t *mq = va_arg (*args, memif_queue_t *);
-  uword indent = format_get_indent (s);
+  u32 indent = format_get_indent (s);
   memif_ring_t *ring;
   u16 ring_size;
   u16 slot;

src/plugins/memif/device.c

@@ -64,7 +64,7 @@ format_memif_device (u8 * s, va_list * args)
 {
   u32 dev_instance = va_arg (*args, u32);
   int verbose = va_arg (*args, int);
-  uword indent = format_get_indent (s);
+  u32 indent = format_get_indent (s);
 
   s = format (s, "MEMIF interface");
   if (verbose)

src/plugins/memif/node.c

@@ -60,7 +60,7 @@ format_memif_input_trace (u8 * s, va_list * args)
   CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
   CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
   memif_input_trace_t *t = va_arg (*args, memif_input_trace_t *);
-  uword indent = format_get_indent (s);
+  u32 indent = format_get_indent (s);
 
   s = format (s, "memif: hw_if_index %d next-index %d",
 	      t->hw_if_index, t->next_index);

src/svm/svm_fifo_segment.c

@@ -604,7 +604,7 @@ format_svm_fifo_segment (u8 * s, va_list * args)
   svm_fifo_t *f;
   int i;
   u32 count;
-  uword indent = format_get_indent (s) + 2;
+  u32 indent = format_get_indent (s) + 2;
 
   sh = sp->ssvm.sh;
   fsh = (svm_fifo_segment_header_t *) sh->opaque[0];

src/tools/vppapigen/node.c

@@ -39,7 +39,7 @@ time_t starttime;
 char *vlib_app_name;
 char *input_filename;
 node_vft_t *the_vft[NODE_N_TYPES];
-static int indent;
+static u32 indent;
 static int dont_output_version;
 int dump_tree;
 static char *fixed_name;

src/vat/api_format.c

@@ -4687,7 +4687,7 @@ format_hex_bytes (u8 * s, va_list * va)
 
   /* Print short or long form depending on byte count. */
   uword short_form = n_bytes <= 32;
-  uword indent = format_get_indent (s);
+  u32 indent = format_get_indent (s);
 
   if (n_bytes == 0)
     return s;

src/vlib/buffer.c

@@ -70,7 +70,7 @@ u8 *
 format_vlib_buffer (u8 * s, va_list * args)
 {
   vlib_buffer_t *b = va_arg (*args, vlib_buffer_t *);
-  uword indent = format_get_indent (s);
+  u32 indent = format_get_indent (s);
 
   s = format (s, "current data %d, length %d, free-list %d, clone-count %u",
 	      b->current_data, b->current_length,

src/vlib/mc.c

@@ -2523,7 +2523,7 @@ format_mc_main (u8 * s, va_list * args)
   mc_main_t *mcm = va_arg (*args, mc_main_t *);
   mc_stream_t *t;
   mc_stream_peer_t *p, *ps;
-  uword indent = format_get_indent (s);
+  u32 indent = format_get_indent (s);
 
   s = format (s, "MC state %U, %d streams joined, global sequence 0x%x",
 	      format_mc_relay_state, mcm->relay_state,

src/vlib/node_cli.c

@@ -102,7 +102,7 @@ format_vlib_node_stats (u8 * s, va_list * va)
   f64 x;
   f64 maxc, maxcn;
   u32 maxn;
-  uword indent;
+  u32 indent;
 
   if (!n)
     {

src/vlib/node_format.c

@@ -45,7 +45,7 @@ format_vlib_node_graph (u8 * s, va_list * va)
   vlib_node_main_t *nm = va_arg (*va, vlib_node_main_t *);
   vlib_node_t *n = va_arg (*va, vlib_node_t *);
   int i, j;
-  uword indent;
+  u32 indent;
   typedef struct
   {
     u32 next_node;

src/vlib/pci/pci.c

@@ -171,7 +171,7 @@ format_vlib_pci_vpd (u8 * s, va_list * args)
 {
   u8 *data = va_arg (*args, u8 *);
   u8 *id = va_arg (*args, u8 *);
-  uword indent = format_get_indent (s);
+  u32 indent = format_get_indent (s);
   char *string_types[] = { "PN", "EC", "SN", "MN", 0 };
   uword p = 0;
   int first_line = 1;

src/vnet/adj/rewrite.c

@@ -69,7 +69,7 @@ format_vnet_rewrite (u8 * s, va_list * args)
 {
   vnet_rewrite_header_t *rw = va_arg (*args, vnet_rewrite_header_t *);
   u32 max_data_bytes = va_arg (*args, u32);
-  CLIB_UNUSED (uword indent) = va_arg (*args, u32);
+  CLIB_UNUSED (u32 indent) = va_arg (*args, u32);
   vnet_main_t *vnm = vnet_get_main ();
 
   if (rw->sw_if_index != ~0)

src/vnet/bfd/bfd_main.c

@@ -1768,7 +1768,7 @@ u8 *
 format_bfd_session (u8 * s, va_list * args)
 {
   const bfd_session_t *bs = va_arg (*args, bfd_session_t *);
-  uword indent = format_get_indent (s);
+  u32 indent = format_get_indent (s);
   s = format (s, "bs_idx=%u local-state=%s remote-state=%s\n"
 	      "%Ulocal-discriminator=%u remote-discriminator=%u\n"
 	      "%Ulocal-diag=%s echo-active=%s\n"

src/vnet/devices/af_packet/node.c

@@ -58,7 +58,7 @@ format_af_packet_input_trace (u8 * s, va_list * args)
   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);

src/vnet/devices/netmap/device.c

@@ -63,7 +63,7 @@ format_netmap_device (u8 * s, va_list * args)
   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)

src/vnet/devices/netmap/node.c

@@ -57,7 +57,7 @@ format_netmap_input_trace (u8 * s, va_list * args)
   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);

src/vnet/devices/virtio/vhost-user.c

@@ -1257,7 +1257,7 @@ format_vhost_trace (u8 * s, va_list * va)
 
   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);

src/vnet/dpo/interface_rx_dpo.c

@@ -365,7 +365,7 @@ format_interface_rx_dpo_trace (u8 * s, va_list * args)
     CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
     CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
     interface_rx_dpo_trace_t * t = va_arg (*args, interface_rx_dpo_trace_t *);
-    uword indent = format_get_indent (s);
+    u32 indent = format_get_indent (s);
     s = format (s, "%U sw_if_index:%d",
                 format_white_space, indent,
                 t->sw_if_index);

src/vnet/dpo/load_balance_map.c

@@ -88,10 +88,10 @@ load_balance_map_get_index (load_balance_map_t *lbm)
 }
 
 u8*
-format_load_balance_map (u8 *s, va_list ap)
+format_load_balance_map (u8 *s, va_list * ap)
 {
-    index_t lbmi = va_arg(ap, index_t);
-    u32 indent = va_arg(ap, u32);
+    index_t lbmi = va_arg(*ap, index_t);
+    u32 indent = va_arg(*ap, u32);
     load_balance_map_t *lbm;
     u32 n_buckets, ii;
 

src/vnet/dpo/load_balance_map.h

@@ -59,7 +59,7 @@ extern void load_balance_map_unlock(index_t lbmi);
 
 extern void load_balance_map_path_state_change(fib_node_index_t path_index);
 
-extern u8* format_load_balance_map(u8 *s, va_list ap);
+extern u8* format_load_balance_map(u8 *s, va_list *ap);
 extern void load_balance_map_show_mem(void);
 
 /**

src/vnet/dpo/lookup_dpo.c

@@ -595,7 +595,7 @@ format_lookup_trace (u8 * s, va_list * args)
     CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
     CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
     lookup_trace_t * t = va_arg (*args, lookup_trace_t *);
-    uword indent = format_get_indent (s);
+    u32 indent = format_get_indent (s);
     s = format (s, "%U fib-index:%d addr:%U load-balance:%d",
                 format_white_space, indent,
                 t->fib_index,
@@ -1113,7 +1113,7 @@ format_lookup_mpls_trace (u8 * s, va_list * args)
     CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
     CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
     lookup_trace_t * t = va_arg (*args, lookup_trace_t *);
-    uword indent = format_get_indent (s);
+    u32 indent = format_get_indent (s);
     mpls_unicast_header_t hdr;
 
     hdr.label_exp_s_ttl = clib_net_to_host_u32(t->hdr.label_exp_s_ttl);

src/vnet/dpo/mpls_label_dpo.c

@@ -550,7 +550,7 @@ format_mpls_label_imposition_trace (u8 * s, va_list * args)
     CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
     mpls_label_imposition_trace_t * t;
     mpls_unicast_header_t hdr;
-    uword indent;
+    u32 indent;
 
     t = va_arg (*args, mpls_label_imposition_trace_t *);
     indent = format_get_indent (s);

src/vnet/ethernet/arp.c

@@ -203,7 +203,7 @@ format_ethernet_arp_header (u8 * s, va_list * va)
 {
   ethernet_arp_header_t *a = va_arg (*va, ethernet_arp_header_t *);
   u32 max_header_bytes = va_arg (*va, u32);
-  uword indent;
+  u32 indent;
   u16 l2_type, l3_type;
 
   if (max_header_bytes != 0 && sizeof (a[0]) > max_header_bytes)

src/vnet/ethernet/format.c

@@ -100,7 +100,7 @@ format_ethernet_header_with_length (u8 * s, va_list * args)
   ethernet_type_t type = clib_net_to_host_u16 (e->type);
   ethernet_type_t vlan_type[ARRAY_LEN (m->vlan)];
   u32 n_vlan = 0, i, header_bytes;
-  uword indent;
+  u32 indent;
 
   while ((type == ETHERNET_TYPE_VLAN || type == ETHERNET_TYPE_DOT1AD
 	  || type == ETHERNET_TYPE_DOT1AH) && n_vlan < ARRAY_LEN (m->vlan))

src/vnet/ethernet/sfp.c

@@ -81,7 +81,7 @@ u8 *
 format_sfp_eeprom (u8 * s, va_list * args)
 {
   sfp_eeprom_t *e = va_arg (*args, sfp_eeprom_t *);
-  uword indent = format_get_indent (s);
+  u32 indent = format_get_indent (s);
   int i;
 
   if (e->id != SFP_ID_sfp)

src/vnet/fib/fib_table.c

@@ -1228,10 +1228,10 @@ fib_table_get_num_entries (u32 fib_index,
 }
 
 u8*
-format_fib_table_name (u8* s, va_list ap)
+format_fib_table_name (u8* s, va_list* ap)
 {
-    fib_node_index_t fib_index = va_arg(ap, fib_node_index_t);
-    fib_protocol_t proto = va_arg(ap, int); // int promotion
+    fib_node_index_t fib_index = va_arg(*ap, fib_node_index_t);
+    fib_protocol_t proto = va_arg(*ap, int); // int promotion
     fib_table_t *fib_table;
 
     fib_table = fib_table_get(fib_index, proto);