From: Martin Klozik <martinx.klozik@intel.com>
Date: Tue, 11 Oct 2016 07:30:34 +0000 (+0000)
Subject: Merge "integration: Test vHost User numa awareness"
X-Git-Tag: danube.1.RC1~78
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=1dfb1ffbcedf8208c14343fa4b8a7f125ff3a30d;p=vswitchperf.git

Merge "integration: Test vHost User numa awareness"
---

1dfb1ffbcedf8208c14343fa4b8a7f125ff3a30d
diff --cc vnfs/qemu/qemu.py
index e654ac7e,977b7bc1..ae0056dc
--- a/vnfs/qemu/qemu.py
+++ b/vnfs/qemu/qemu.py
@@@ -81,16 -81,13 +81,18 @@@ class IVnfQemu(IVnf)
                                self._testpmd_fwd_mode, 'io')
              self._testpmd_fwd_mode = 'io'
  
 +        guest_smp = int(get_test_param('guest_smp', 0))
 +        if guest_smp:
 +            override_list = [guest_smp] * (self._number + 1)
 +            S.setValue('GUEST_SMP', override_list)
 +
          name = 'Client%d' % self._number
          vnc = ':%d' % self._number
-         # don't use taskset to affinize main qemu process; It causes hangup
-         # of 2nd VM in case of DPDK. It also slows down VM responsivnes.
-         self._cmd = ['sudo', '-E', S.getValue('TOOLS')['qemu-system'],
+         # NOTE: affinization of main qemu process can cause hangup of 2nd VM
+         # in case of DPDK usage. It can also slow down VM response time.
+         cpumask = ",".join(S.getValue('GUEST_CORE_BINDING')[self._number])
+         self._cmd = ['sudo', '-E', 'taskset', '-c', cpumask,
+                      S.getValue('TOOLS')['qemu-system'],
                       '-m', S.getValue('GUEST_MEMORY')[self._number],
                       '-smp', str(S.getValue('GUEST_SMP')[self._number]),
                       '-cpu', 'host,migratable=off',