diff options
| author |   Martin Klozik <martinx.klozik@intel.com> | 2016-08-26 15:39:29 +0100 |
|---|---|---|
| committer | Martin Klozik <martinx.klozik@intel.com> | 2016-09-15 14:37:44 +0100 |
| commit | 9b1af783ec53050129239102355e1a5c3ceb1d97 (patch) | |
| tree | 4a994af7b986af3c72c21c0ac87f398b42a44b74 /conf/04_vnf.conf | |
| parent | acdb444a54124834acdde45107062eaf1452c119 (diff) | |
paths: Support binary packages
Currently VSPERF supports OVS, DPDK and QEMU built
from the source code only. In some cases it is required
to support installation of these tools from binary packages
available for given linux distribution. Thus VSPERF
configuration and code was modified to suport both source
and binary versions of tools. This can be configured perf
tool, so various combinations of source and binary version
are supported.
Together with new configuration also a handling of kernel
modules was modified to automatically detect and load module
dependencies.
JIRA: VSPERF-340
JIRA: VSPERF-339
Change-Id: I855cb438cbd8998bdc499613ea5e7de2526299d7
Signed-off-by: Martin Klozik <martinx.klozik@intel.com>
Reviewed-by: Maryam Tahhan <maryam.tahhan@intel.com>
Reviewed-by: Al Morton <acmorton@att.com>
Reviewed-by: Christian Trautman <ctrautma@redhat.com>
Reviewed-by: Bill Michalowski <bmichalo@redhat.com>
Reviewed-by: Otto Sabart <osabart@redhat.com>
Diffstat (limited to 'conf/04_vnf.conf')
| -rw-r--r-- | conf/04_vnf.conf | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/conf/04_vnf.conf b/conf/04_vnf.conf index 2e86b358..dcdf3316 100644 --- a/conf/04_vnf.conf +++ b/conf/04_vnf.conf @@ -20,10 +20,20 @@ VNF = 'QemuDpdkVhostUser' VNF_AFFINITIZATION_ON = True # ############################ -# Executables and log files +# Directories, executables and log files # ############################ -QEMU_BIN = os.path.join(QEMU_DIR, 'x86_64-softmmu/qemu-system-x86_64') +# please see conf/00_common.conf for description of PATHS dictionary +PATHS['qemu'] = { + 'type' : 'src', + 'src': { + 'path': os.path.join(ROOT_DIR, 'src/qemu/qemu/'), + 'qemu-system': 'x86_64-softmmu/qemu-system-x86_64' + }, + 'bin': { + 'qemu-system': 'qemu-system-x86_64' + } +} # log file for qemu LOG_FILE_QEMU = 'qemu.log' |