test/vhost: respect additional params for vhost_run

Removing "shift" command because it was not needed and
caused vhost run command to be not properly constructed.

Needed to fix if contition for --no-pci param while at it.
There was no $no_pci variable defined after optargs were
removed.

Change-Id: I72c615fdb2a5fd507efedae100b9b79c5cfd8935
Signed-off-by: Karol Latecki <karol.latecki@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/468202
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
This commit is contained in:
Karol Latecki 2019-09-12 09:05:43 +02:00 committed by Ben Walker
parent 1b10706ee0
commit a2ab5eb0c6

View File

@ -111,8 +111,6 @@ function vhost_run()
{ {
local vhost_name="$1" local vhost_name="$1"
shift
if [[ -z "$vhost_name" ]]; then if [[ -z "$vhost_name" ]]; then
error "vhost name must be provided to vhost_run" error "vhost name must be provided to vhost_run"
return 1 return 1
@ -147,7 +145,7 @@ function vhost_run()
notice "waiting for app to run..." notice "waiting for app to run..."
waitforlisten "$vhost_pid" "$vhost_dir/rpc.sock" waitforlisten "$vhost_pid" "$vhost_dir/rpc.sock"
#do not generate nvmes if pci access is disabled #do not generate nvmes if pci access is disabled
if [[ -z "$no_pci" ]]; then if [[ "$cmd" != *"--no-pci"* ]] && [[ "$cmd" != *"-u"* ]]; then
$rootdir/scripts/gen_nvme.sh "--json" | $rootdir/scripts/rpc.py\ $rootdir/scripts/gen_nvme.sh "--json" | $rootdir/scripts/rpc.py\
-s $vhost_dir/rpc.sock load_subsystem_config -s $vhost_dir/rpc.sock load_subsystem_config
fi fi