aboutsummaryrefslogtreecommitdiffstats
path: root/vnfs/qemu/qemu_dpdk_vhost_user.py
diff options
context:
space:
mode:
authorMartin Klozik <martinx.klozik@intel.com>2017-04-12 05:47:00 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-04-12 05:47:00 +0000
commit0c4ab9b84ea256d22176ba6c9e89cefe9c212b7e (patch)
treeb20aafe2050ff9bef684e80600f9714da90236f4 /vnfs/qemu/qemu_dpdk_vhost_user.py
parentbd4859904037d5259d36d7689d464864bad5c395 (diff)
parentc071fadc49859b4cb6bd0c37a85746287612c42b (diff)
Merge "jumbo_frame: Add jumbo frame support"
Diffstat (limited to 'vnfs/qemu/qemu_dpdk_vhost_user.py')
-rw-r--r--vnfs/qemu/qemu_dpdk_vhost_user.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/vnfs/qemu/qemu_dpdk_vhost_user.py b/vnfs/qemu/qemu_dpdk_vhost_user.py
index f09ded13..3e9aecc8 100644
--- a/vnfs/qemu/qemu_dpdk_vhost_user.py
+++ b/vnfs/qemu/qemu_dpdk_vhost_user.py
@@ -41,7 +41,12 @@ class QemuDpdkVhostUser(IVnfQemu):
# Guest merge buffer setting
if S.getValue('GUEST_NIC_MERGE_BUFFERS_DISABLE')[self._number]:
- merge_buff = 'mrg_rxbuf=off,'
+ if S.getValue('VSWITCH_JUMBO_FRAMES_ENABLED'):
+ self._logger.warning(
+ 'Mergable buffers must be enabled for jumbo frames. Overriding.')
+ merge_buff = ''
+ else:
+ merge_buff = 'mrg_rxbuf=off,'
else:
merge_buff = ''