X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fplugins%2Fdpdk%2Fdevice%2Fformat.c;h=9124ec27df5649de148049cfb21ca2c2fb5fd6ea;hb=f286c4b9427748568036d04e8aa2408a4069dee7;hp=4494895f380fe991be4f0d5c9586665ad5cf3318;hpb=cef69caf1dcd3a2452d38c5fa516d0b61b56c34a;p=vpp.git

diff --git a/src/plugins/dpdk/device/format.c b/src/plugins/dpdk/device/format.c
index 4494895f380..9124ec27df5 100644
--- a/src/plugins/dpdk/device/format.c
+++ b/src/plugins/dpdk/device/format.c
@@ -152,6 +152,7 @@ format_dpdk_device_name (u8 * s, va_list * args)
   char *devname_format;
   char *device_name;
   u32 i = va_arg (*args, u32);
+  dpdk_device_t *xd = vec_elt_at_index (dm->devices, i);
   struct rte_eth_dev_info dev_info;
   struct rte_pci_device *pci_dev;
   u8 *ret;
@@ -215,7 +216,6 @@ format_dpdk_device_name (u8 * s, va_list * args)
       break;
 
     case VNET_DPDK_PORT_TYPE_AF_PACKET:
-      rte_eth_dev_info_get (i, &dev_info);
       return format (s, "af_packet%d", dm->devices[i].af_packet_instance_num);
 
     case VNET_DPDK_PORT_TYPE_VIRTIO_USER:
@@ -236,10 +236,10 @@ format_dpdk_device_name (u8 * s, va_list * args)
       break;
     }
 
-  rte_eth_dev_info_get (i, &dev_info);
+  rte_eth_dev_info_get (xd->port_id, &dev_info);
   pci_dev = dpdk_get_pci_device (&dev_info);
 
-  if (pci_dev)
+  if (pci_dev && dm->devices[i].port_type != VNET_DPDK_PORT_TYPE_FAILSAFE)
     ret = format (s, devname_format, device_name, pci_dev->addr.bus,
 		  pci_dev->addr.devid, pci_dev->addr.function);
   else
@@ -370,6 +370,10 @@ format_dpdk_device_type (u8 * s, va_list * args)
       dev_type = "Cavium QLogic FastLinQ QL4xxxx";
       break;
 
+    case VNET_DPDK_PMD_NETVSC:
+      dev_type = "Microsoft Hyper-V Netvsc";
+      break;
+
     default:
     case VNET_DPDK_PMD_UNKNOWN:
       dev_type = "### UNKNOWN ###";
@@ -564,7 +568,7 @@ format_dpdk_device (u8 * s, va_list * args)
   rte_eth_dev_info_get (xd->port_id, &di);
 
   s = format (s, "%U\n%Ucarrier %U",
-	      format_dpdk_device_type, xd->port_id,
+	      format_dpdk_device_type, dev_instance,
 	      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);