From cdba631d32461d5f5916b369a9007a63891c55a6 Mon Sep 17 00:00:00 2001 From: Martin Klozik Date: Wed, 13 Apr 2016 14:26:07 +0100 Subject: vm: use the same testpmd sources inside VM Always copy testpmd sources from the directory with vHost User version of DPDK. This will avoid possible issues with missing dependencies in some VM images. It will also ensure, that testpmd inside VM is agnostic to chosen vHost method. Change-Id: I0496cc846eff3f7d4c1aef0a9c825545a4c3c818 JIRA: VSPERF-283 Signed-off-by: Martin Klozik Reviewed-by: Maryam Tahhan Reviewed-by: Al Morton Reviewed-by: Christian Trautman Reviewed-by: Brian Castelli --- vnfs/qemu/qemu.py | 2 +- vnfs/qemu/qemu_dpdk_vhost_cuse.py | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-) (limited to 'vnfs') diff --git a/vnfs/qemu/qemu.py b/vnfs/qemu/qemu.py index 686fb431..c735062f 100644 --- a/vnfs/qemu/qemu.py +++ b/vnfs/qemu/qemu.py @@ -251,7 +251,7 @@ class IVnfQemu(IVnf): def _modify_dpdk_makefile(self): """ - Modifies DPDK makefile in Guest before compilation + Modifies DPDK makefile in Guest before compilation if needed """ pass diff --git a/vnfs/qemu/qemu_dpdk_vhost_cuse.py b/vnfs/qemu/qemu_dpdk_vhost_cuse.py index e5a5e823..ab4fec84 100644 --- a/vnfs/qemu/qemu_dpdk_vhost_cuse.py +++ b/vnfs/qemu/qemu_dpdk_vhost_cuse.py @@ -56,13 +56,3 @@ class QemuDpdkVhostCuse(IVnfQemu): ',netdev=' + net2 + ',csum=off,gso=off,' + 'guest_tso4=off,guest_tso6=off,guest_ecn=off', ] - - # helper functions - - def _modify_dpdk_makefile(self): - """ - Modifies DPDK makefile in Guest before compilation - """ - self.execute_and_wait("sed -i -e 's/CONFIG_RTE_LIBRTE_VHOST_USER=n/" + - "CONFIG_RTE_LIBRTE_VHOST_USER=y/g'" + - "config/common_linuxapp") -- cgit 1.2.3-korg