From cecfc87fc706a6ac819aa213b368072fa011bcae Mon Sep 17 00:00:00 2001 From: Jianfeng Tan Date: Thu, 13 Jun 2019 15:14:12 +0800 Subject: dpdk: move to v18.11 as default DPDK version DPDK v18.11 is the latest LTS verison. As of the API/ABI changes introduced in ether at v18.08, we cannot compile l4fwd and nginx with old DPDK versions. Change-Id: I225302d9a257e9bce4aa22ff84d76a57170e7eb7 Signed-off-by: Jianfeng Tan Signed-off-by: Konstantin Ananyev --- test/gtest/test_tle_udp_stream_gen.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'test') diff --git a/test/gtest/test_tle_udp_stream_gen.h b/test/gtest/test_tle_udp_stream_gen.h index d9d5337..1f3d210 100644 --- a/test/gtest/test_tle_udp_stream_gen.h +++ b/test/gtest/test_tle_udp_stream_gen.h @@ -195,7 +195,7 @@ struct test_str { vector gen_streams; }; -const char *vdevargs[] = {VDEV_NAME",rx_pcap=" RX_PCAP",tx_pcap=" TX_PCAP}; +const char *vdevargs = "rx_pcap=" RX_PCAP ",tx_pcap=" TX_PCAP; class test_tle_udp_gen_base : public testing::TestWithParam { public: @@ -307,14 +307,15 @@ public: map routes4; map routes6; test_str tp; - void *cb; + const void *cb; }; int test_tle_udp_gen_base::setup_devices(dpdk_port_t *portid) { /* attach + configure + start pmd device */ - if (rte_eth_dev_attach(vdevargs[0], portid) != 0) + if (rte_eal_hotplug_add("vdev", VDEV_NAME, vdevargs) < 0 || + rte_eth_dev_get_port_by_name(VDEV_NAME, portid) != 0) return -1; cb = rte_eth_add_rx_callback(*portid, 0, typen_rx_callback, nullptr); @@ -332,7 +333,7 @@ test_tle_udp_gen_base::cleanup_devices(dpdk_port_t portid) rte_eth_dev_stop(portid); rte_eth_dev_close(portid); - rte_eth_dev_detach(portid, name); + rte_eal_hotplug_remove("vdev", VDEV_NAME); return 0; } -- cgit 1.2.3-korg