summaryrefslogtreecommitdiffstats
path: root/vnfs
diff options
context:
space:
mode:
authorLukasz Pawlik <lukaszx.pawlik@intel.com>2019-10-04 13:04:40 +0100
committerEmma Finn <emma.finn@intel.com>2019-10-29 11:04:31 +0000
commit755894494dc58e093d7376bf41f15dcbbdb5e53b (patch)
treeeb8e589b4ef3519c39d420b6d367248472b37bf6 /vnfs
parent115ea9be50aee7db38d92399bc2d46a60e1d7e2d (diff)
integration: fix ovs/dpdk with DPDK >= 18.02
In DPDK >= 18.02 disable-hw-vlan testpmd command line was changed. Parameter disable-hw-vlan is default and user has to explicitly enable it. This patch fix testpmd command line parameters. Also in DPDK >= 18.05 igb_uio kernel module was moved to different directory. Compilation of kernel module only is broken. This patch fix this. Now whole DPDK project is build. Change-Id: I6c8c44979192201c42e6a71b55c37a50fa64fd96 Signed-off-by: Lukasz Pawlik <lukaszx.pawlik@intel.com>
Diffstat (limited to 'vnfs')
-rw-r--r--vnfs/qemu/qemu.py13
1 files changed, 9 insertions, 4 deletions
diff --git a/vnfs/qemu/qemu.py b/vnfs/qemu/qemu.py
index 857793f8..a2c8d4be 100644
--- a/vnfs/qemu/qemu.py
+++ b/vnfs/qemu/qemu.py
@@ -503,11 +503,16 @@ class IVnfQemu(IVnf):
pci_slots)
elif driver == 'igb_uio_from_src':
# build and insert igb_uio and rebind interfaces to it
- self.execute_and_wait('make RTE_OUTPUT=$RTE_SDK/$RTE_TARGET -C '
- '$RTE_SDK/lib/librte_eal/linuxapp/igb_uio')
+ # from DPDK 18.05 Linux kernel driver changed location
+ # also it is not possible to compile driver without
+ # passing EXTRA_CFLAGS
+ self.execute_and_wait("make RTE_OUTPUT=$RTE_SDK/{0} \
+ EXTRA_CFLAGS=\"-I$RTE_SDK/{1}/include\" \
+ -C $RTE_SDK/kernel/linux/igb_uio"\
+ .format(S.getValue('RTE_TARGET'), S.getValue('RTE_TARGET')))
self.execute_and_wait('modprobe uio')
- self.execute_and_wait('insmod %s/kmod/igb_uio.ko' %
- S.getValue('RTE_TARGET'))
+ self.execute_and_wait('insmod {}/kmod/igb_uio.ko'\
+ .format(S.getValue('RTE_TARGET')))
self.execute_and_wait('./*tools/dpdk*bind.py -b igb_uio ' + pci_slots)
else:
self._logger.error(