Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
dpdk: allow interface name to be specified from startup.conf
[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
9124ec2
..
bbc61e3
100644
(file)
--- a/
src/plugins/dpdk/device/format.c
+++ b/
src/plugins/dpdk/device/format.c
@@
-157,12
+157,15
@@
format_dpdk_device_name (u8 * s, va_list * args)
struct rte_pci_device *pci_dev;
u8 *ret;
struct rte_pci_device *pci_dev;
u8 *ret;
+ if (xd->name)
+ return format (s, "%s", xd->name);
+
if (dm->conf->interface_name_format_decimal)
devname_format = "%s%d/%d/%d";
else
devname_format = "%s%x/%x/%x";
if (dm->conf->interface_name_format_decimal)
devname_format = "%s%d/%d/%d";
else
devname_format = "%s%x/%x/%x";
- switch (
dm->devices[i].
port_type)
+ switch (
xd->
port_type)
{
case VNET_DPDK_PORT_TYPE_ETH_1G:
device_name = "GigabitEthernet";
{
case VNET_DPDK_PORT_TYPE_ETH_1G:
device_name = "GigabitEthernet";
@@
-205,7
+208,7
@@
format_dpdk_device_name (u8 * s, va_list * args)
break;
case VNET_DPDK_PORT_TYPE_ETH_BOND:
break;
case VNET_DPDK_PORT_TYPE_ETH_BOND:
- return format (s, "BondEthernet%d",
dm->devices[i].
bond_instance_num);
+ return format (s, "BondEthernet%d",
xd->
bond_instance_num);
case VNET_DPDK_PORT_TYPE_ETH_SWITCH:
device_name = "EthernetSwitch";
case VNET_DPDK_PORT_TYPE_ETH_SWITCH:
device_name = "EthernetSwitch";
@@
-216,7
+219,7
@@
format_dpdk_device_name (u8 * s, va_list * args)
break;
case VNET_DPDK_PORT_TYPE_AF_PACKET:
break;
case VNET_DPDK_PORT_TYPE_AF_PACKET:
- return format (s, "af_packet%d",
dm->devices[i].
af_packet_instance_num);
+ return format (s, "af_packet%d",
xd->
af_packet_instance_num);
case VNET_DPDK_PORT_TYPE_VIRTIO_USER:
device_name = "VirtioUser";
case VNET_DPDK_PORT_TYPE_VIRTIO_USER:
device_name = "VirtioUser";
@@
-239,14
+242,14
@@
format_dpdk_device_name (u8 * s, va_list * args)
rte_eth_dev_info_get (xd->port_id, &dev_info);
pci_dev = dpdk_get_pci_device (&dev_info);
rte_eth_dev_info_get (xd->port_id, &dev_info);
pci_dev = dpdk_get_pci_device (&dev_info);
- if (pci_dev &&
dm->devices[i].
port_type != VNET_DPDK_PORT_TYPE_FAILSAFE)
+ if (pci_dev &&
xd->
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
ret = format (s, devname_format, device_name, pci_dev->addr.bus,
pci_dev->addr.devid, pci_dev->addr.function);
else
- ret = format (s, "%s%d", device_name,
dm->devices[i].
port_id);
+ ret = format (s, "%s%d", device_name,
xd->
port_id);
- if (
dm->devices[i].
interface_name_suffix)
- return format (ret, "/%s",
dm->devices[i].
interface_name_suffix);
+ if (
xd->
interface_name_suffix)
+ return format (ret, "/%s",
xd->
interface_name_suffix);
return ret;
}
return ret;
}
@@
-398,8
+401,8
@@
format_dpdk_link_status (u8 * s, va_list * args)
s = format (s, "%s duplex ", (l->link_duplex == ETH_LINK_FULL_DUPLEX) ?
"full" : "half");
s = format (s, "%s duplex ", (l->link_duplex == ETH_LINK_FULL_DUPLEX) ?
"full" : "half");
- s = format (s, "
speed %u mtu %d %s\n", l->link_speed,
-
hi->max_packet_bytes, promisc ?
" promisc" : "");
+ s = format (s, "
mtu %d %s\n", hi->max_packet_bytes, promisc ?
+ " promisc" : "");
}
else
s = format (s, "\n");
}
else
s = format (s, "\n");