diff options
author | Christophe Fontaine <christophe.fontaine@enea.com> | 2017-10-02 18:10:54 +0200 |
---|---|---|
committer | Chris Luke <chris_luke@comcast.com> | 2017-10-04 17:31:13 +0000 |
commit | d3c008d108aa2187d1a2afe2833b4de25ca2c2ab (patch) | |
tree | 03c85d4348fc955b33e6a6d628b5f8b81a2c8af6 /src/vnet/devices | |
parent | 9bce0f6d7c3f7f1d5f2989ff1157c2a1039cdef6 (diff) |
[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>
Diffstat (limited to 'src/vnet/devices')
-rw-r--r-- | src/vnet/devices/af_packet/node.c | 2 | ||||
-rw-r--r-- | src/vnet/devices/netmap/device.c | 2 | ||||
-rw-r--r-- | src/vnet/devices/netmap/node.c | 2 | ||||
-rw-r--r-- | src/vnet/devices/virtio/vhost-user.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/vnet/devices/af_packet/node.c b/src/vnet/devices/af_packet/node.c index 5301ad299f2..ec7c273b0e5 100644 --- a/src/vnet/devices/af_packet/node.c +++ b/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); diff --git a/src/vnet/devices/netmap/device.c b/src/vnet/devices/netmap/device.c index aea9ddf4eb1..e39888f4bf7 100644 --- a/src/vnet/devices/netmap/device.c +++ b/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) diff --git a/src/vnet/devices/netmap/node.c b/src/vnet/devices/netmap/node.c index e120eeaeabd..67ddce58440 100644 --- a/src/vnet/devices/netmap/node.c +++ b/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); diff --git a/src/vnet/devices/virtio/vhost-user.c b/src/vnet/devices/virtio/vhost-user.c index 4200ed8d8f3..ca54f110948 100644 --- a/src/vnet/devices/virtio/vhost-user.c +++ b/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); |