devices: Display VhostEthernet instead of UnknownEthernet for dpdk net_vhost driver

[vpp.git] / src / plugins / dpdk / device / format.c

diff --git a/src/plugins/dpdk/device/format.c b/src/plugins/dpdk/device/format.c
index 0b67eae..21475ac 100644 (file)
--- a/src/plugins/dpdk/device/format.c
+++ b/src/plugins/dpdk/device/format.c
@@ -143,6 +143,16 @@
   foreach_dpdk_pkt_rx_offload_flag              \
   foreach_dpdk_pkt_tx_offload_flag
 
+#define foreach_dpdk_log_level \
+  _ (EMERG, "emergency")       \
+  _ (ALERT, "alert")           \
+  _ (CRIT, "critical")         \
+  _ (ERR, "error")             \
+  _ (WARNING, "warning")       \
+  _ (NOTICE, "notice")         \
+  _ (INFO, "info")             \
+  _ (DEBUG, "debug")
+
 u8 *
 format_dpdk_device_name (u8 * s, va_list * args)
 {
@@ -176,6 +186,10 @@ format_dpdk_device_name (u8 * s, va_list * args)
       device_name = "FortyGigabitEthernet";
       break;
 
+    case VNET_DPDK_PORT_TYPE_ETH_50G:
+      device_name = "FiftyGigabitEthernet";
+      break;
+
     case VNET_DPDK_PORT_TYPE_ETH_100G:
       device_name = "HundredGigabitEthernet";
       break;
@@ -195,6 +209,14 @@ format_dpdk_device_name (u8 * s, va_list * args)
       rte_eth_dev_info_get (i, &dev_info);
       return format (s, "af_packet%d", dm->devices[i].port_id);
 
+    case VNET_DPDK_PORT_TYPE_VIRTIO_USER:
+      device_name = "VirtioUser";
+      break;
+
+    case VNET_DPDK_PORT_TYPE_VHOST_ETHER:
+      device_name = "VhostEthernet";
+      break;
+
     default:
     case VNET_DPDK_PORT_TYPE_UNKNOWN:
       device_name = "UnknownEthernet";
@@ -292,6 +314,17 @@ format_dpdk_device_type (u8 * s, va_list * args)
       dev_type = "NXP DPAA2 Mac";
       break;
 
+    case VNET_DPDK_PMD_VIRTIO_USER:
+      dev_type = "Virtio User";
+      break;
+
+    case VNET_DPDK_PMD_THUNDERX:
+      dev_type = "Cavium ThunderX";
+
+    case VNET_DPDK_PMD_VHOST_ETHER:
+      dev_type = "VhostEthernet";
+      break;
+
     default:
     case VNET_DPDK_PMD_UNKNOWN:
       dev_type = "### UNKNOWN ###";
@@ -704,36 +737,6 @@ format_dpdk_rte_mbuf (u8 * s, va_list * va)
   return s;
 }
 
-/* FIXME is this function used? */
-#if 0
-uword
-unformat_socket_mem (unformat_input_t * input, va_list * va)
-{
-  uword **r = va_arg (*va, uword **);
-  int i = 0;
-  u32 mem;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, ","))
-       hash_set (*r, i, 1024);
-      else if (unformat (input, "%u,", &mem))
-       hash_set (*r, i, mem);
-      else if (unformat (input, "%u", &mem))
-       hash_set (*r, i, mem);
-      else
-       {
-         unformat_put_input (input);
-         goto done;
-       }
-      i++;
-    }
-
-done:
-  return 1;
-}
-#endif
-
 clib_error_t *
 unformat_rss_fn (unformat_input_t * input, uword * rss_fn)
 {
@@ -757,6 +760,20 @@ unformat_rss_fn (unformat_input_t * input, uword * rss_fn)
   return 0;
 }
 
+uword
+unformat_dpdk_log_level (unformat_input_t * input, va_list * args)
+{
+  u32 *r = va_arg (*args, u32 *);
+
+  if (0);
+#define _(v,s) else if (unformat (input, s)) *r = RTE_LOG_##v;
+  foreach_dpdk_log_level
+#undef _
+    else
+    return 0;
+  return 1;
+}
+
 clib_error_t *
 unformat_hqos (unformat_input_t * input, dpdk_device_config_hqos_t * hqos)
 {