From: Ivan Ilchenko <ivan.ilche...@oktetlabs.ru> rte_eth_dev_info_get() return value was changed from void to int, so this patch modify rte_eth_dev_info_get() usage across latency component according to its new return type.
Signed-off-by: Ivan Ilchenko <ivan.ilche...@oktetlabs.ru> Signed-off-by: Andrew Rybchenko <arybche...@solarflare.com> --- lib/librte_latencystats/rte_latencystats.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/lib/librte_latencystats/rte_latencystats.c b/lib/librte_latencystats/rte_latencystats.c index 06c6283..98e0189 100644 --- a/lib/librte_latencystats/rte_latencystats.c +++ b/lib/librte_latencystats/rte_latencystats.c @@ -208,6 +208,7 @@ struct latency_stats_nameoff { const char *ptr_strings[NUM_LATENCY_STATS] = {0}; const struct rte_memzone *mz = NULL; const unsigned int flags = 0; + int ret; if (rte_memzone_lookup(MZ_RTE_LATENCY_STATS)) return -EEXIST; @@ -239,7 +240,16 @@ struct latency_stats_nameoff { /** Register Rx/Tx callbacks */ RTE_ETH_FOREACH_DEV(pid) { struct rte_eth_dev_info dev_info; - rte_eth_dev_info_get(pid, &dev_info); + + ret = rte_eth_dev_info_get(pid, &dev_info); + if (ret != 0) { + RTE_LOG(INFO, LATENCY_STATS, + "Error during getting device (port %u) info: %s\n", + pid, strerror(-ret)); + + continue; + } + for (qid = 0; qid < dev_info.nb_rx_queues; qid++) { cbs = &rx_cbs[pid][qid]; cbs->cb = rte_eth_add_first_rx_callback(pid, qid, @@ -274,7 +284,16 @@ struct latency_stats_nameoff { /** De register Rx/Tx callbacks */ RTE_ETH_FOREACH_DEV(pid) { struct rte_eth_dev_info dev_info; - rte_eth_dev_info_get(pid, &dev_info); + + ret = rte_eth_dev_info_get(pid, &dev_info); + if (ret != 0) { + RTE_LOG(INFO, LATENCY_STATS, + "Error during getting device (port %u) info: %s\n", + pid, strerror(-ret)); + + continue; + } + for (qid = 0; qid < dev_info.nb_rx_queues; qid++) { cbs = &rx_cbs[pid][qid]; ret = rte_eth_remove_rx_callback(pid, qid, cbs->cb); -- 1.8.3.1