X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fdpdk%2Fdevice%2Fformat.c;h=8ef46512c6fadd3d45255ed9558b103f447c8af5;hb=548d70de68a4156d5bd4148e50a81555a0ef169f;hp=7bba3eb4b6e2512bdc9782a4e5e355efe608016c;hpb=831f4200cab2b363f2a8ea340331343c14407b7d;p=vpp.git

diff --git a/src/plugins/dpdk/device/format.c b/src/plugins/dpdk/device/format.c
index 7bba3eb4b6e..8ef46512c6f 100644
--- a/src/plugins/dpdk/device/format.c
+++ b/src/plugins/dpdk/device/format.c
@@ -362,6 +362,10 @@ format_dpdk_device_type (u8 * s, va_list * args)
       dev_type = "Microsoft Hyper-V Netvsc";
       break;
 
+    case VNET_DPDK_PMD_BNXT:
+      dev_type = "Broadcom NetXtreme E/S-Series";
+      break;
+
     default:
     case VNET_DPDK_PMD_UNKNOWN:
       dev_type = "### UNKNOWN ###";
@@ -560,6 +564,9 @@ format_dpdk_device (u8 * s, va_list * args)
 	      format_white_space, indent + 2, format_dpdk_link_status, xd);
   s = format (s, "%Uflags: %U\n",
 	      format_white_space, indent + 2, format_dpdk_device_flags, xd);
+  if (di.device->devargs && di.device->devargs->args)
+    s = format (s, "%UDevargs: %s\n",
+		format_white_space, indent + 2, di.device->devargs->args);
   s = format (s, "%Urx: queues %d (max %d), desc %d "
 	      "(min %d max %d align %d)\n",
 	      format_white_space, indent + 2, xd->rx_q_used, di.max_rx_queues,
@@ -602,8 +609,11 @@ format_dpdk_device (u8 * s, va_list * args)
 	  vec_free (s2);
 	}
 
-      s = format (s, "%Umodule: %U\n", format_white_space, indent + 2,
-		  format_dpdk_device_module_info, xd);
+      if (1 < verbose)
+	{
+	  s = format (s, "%Umodule: %U\n", format_white_space, indent + 2,
+		      format_dpdk_device_module_info, xd);
+	}
 
       s = format (s, "%Umax rx packet len: %d\n", format_white_space,
 		  indent + 2, di.max_rx_pktlen);
@@ -665,7 +675,7 @@ format_dpdk_device (u8 * s, va_list * args)
   vec_validate (xstat_names, len - 1);
   int ret = rte_eth_xstats_get_names (xd->port_id, xstat_names, len);
 
-  if (ret < 0 || ret > len)
+  if (ret >= 0 && ret <= len)
     {
       /* *INDENT-OFF* */
       vec_foreach_index(i, xd->xstats)
@@ -903,25 +913,6 @@ unformat_rss_fn (unformat_input_t * input, uword * rss_fn)
   return 0;
 }
 
-clib_error_t *
-unformat_hqos (unformat_input_t * input, dpdk_device_config_hqos_t * hqos)
-{
-  clib_error_t *error = 0;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "hqos-thread %u", &hqos->hqos_thread))
-	hqos->hqos_thread_valid = 1;
-      else
-	{
-	  error = clib_error_return (0, "unknown input `%U'",
-				     format_unformat_error, input);
-	  break;
-	}
-    }
-
-  return error;
-}
 
 /*
  * fd.io coding-style-patch-verification: ON