diff options
| author |   Dino Simeon Madarang <dino.simeonx.madarang@intel.com> | 2015-08-26 16:35:37 +0100 |
|---|---|---|
| committer | Dino Simeon Madarang <dino.simeonx.madarang@intel.com> | 2015-09-01 23:44:33 +0100 |
| commit | dcb66fe7b184080d521e341ac4f73c165abacc37 (patch) | |
| tree | 0ce651219340d6e17a003d02aba6bb5eeb9d09c6 /vswitches | |
| parent | d9a8e08292e989fd369b0564bee9e3aa02b3eef5 (diff) | |
vswitches: Fix error in loading eventfd module
Load eventfd only when vhost-cuse is specified as
the guest access method.
This commit also includes quickstart update for executing PVP tests.
JIRA: VSPERF-59
Change-Id: I41f116ab1c42f704026567a269922c07994b15a5
Signed-off-by: Dino Simeon Madarang <dino.simeonx.madarang@intel.com>
Reviewed-by: Maryam Tahhan <maryam.tahhan@intel.com>
Reviewed-by: Billy O Mahony <billy.o.mahony@intel.com>
Reviewed-by: Al Morton <acmorton@att.com>
Reviewed-by: Gurpreet Singh <gurpreet.singh@spirent.com>
Reviewed-by: Tv Rao <tv.rao@freescale.com>
Reviewed-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
Diffstat (limited to 'vswitches')
| -rw-r--r-- | vswitches/ovs_dpdk_vhost.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/vswitches/ovs_dpdk_vhost.py b/vswitches/ovs_dpdk_vhost.py index 2e726a43..b1fd08bf 100644 --- a/vswitches/ovs_dpdk_vhost.py +++ b/vswitches/ovs_dpdk_vhost.py @@ -22,6 +22,7 @@ from src.ovs import VSwitchd, OFBridge from src.dpdk import dpdk _VSWITCHD_CONST_ARGS = ['--', '--log-file'] +_VHOST_METHOD = settings.getValue('VHOST_METHOD') class OvsDpdkVhost(IVSwitch): """VSwitch implementation using DPDK and vhost ports @@ -42,8 +43,9 @@ class OvsDpdkVhost(IVSwitch): vswitchd_args += settings.getValue('VSWITCHD_DPDK_ARGS') vswitchd_args += _VSWITCHD_CONST_ARGS - self._logger.info("Inserting VHOST modules into kernel...") - dpdk.insert_vhost_modules() + if _VHOST_METHOD == "cuse": + self._logger.info("Inserting VHOST modules into kernel...") + dpdk.insert_vhost_modules() self._vswitchd = VSwitchd(vswitchd_args=vswitchd_args, expected_cmd= @@ -117,8 +119,7 @@ class OvsDpdkVhost(IVSwitch): """ bridge = self._bridges[switch_name] # Changed dpdkvhost to dpdkvhostuser to be able to run in Qemu 2.2 - vhost_method = settings.getValue('VHOST_METHOD') - if vhost_method == "cuse": + if _VHOST_METHOD == "cuse": vhost_count = self._get_port_count(bridge, 'type=dpdkvhostcuse') port_name = 'dpdkvhostcuse' + str(vhost_count) params = ['--', 'set', 'Interface', port_name, 'type=dpdkvhostcuse'] |